diff options
| author | wm4 <wm4@nowhere> | 2016-02-15 20:34:45 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-02-15 20:34:45 +0100 |
| commit | f2b039da77fc66119d556e575822c2b8d328cdaf (patch) | |
| tree | 658de5151cc968bfeb79f222a181afac926b390b /video/decode/vd_lavc.c | |
| parent | f219a48dca7dbd525c1611b1d579947a3dd9b82b (diff) | |
| download | mpv-f2b039da77fc66119d556e575822c2b8d328cdaf.tar.bz2 mpv-f2b039da77fc66119d556e575822c2b8d328cdaf.tar.xz | |
audio/video: expose codec info as separate field
Preparation for the timeline rewrite. The codec will be able to change,
the stream header not.
Diffstat (limited to 'video/decode/vd_lavc.c')
| -rw-r--r-- | video/decode/vd_lavc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 2a7928b96e..ef713c2d65 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -359,8 +359,7 @@ static void init_avctx(struct dec_video *vd, const char *decoder, vd_ffmpeg_ctx *ctx = vd->priv; struct vd_lavc_params *lavc_param = vd->opts->vd_lavc_params; bool mp_rawvideo = false; - struct sh_stream *sh = vd->header; - struct mp_codec_params *c = sh->codec; + struct mp_codec_params *c = vd->codec; assert(!ctx->avctx); @@ -522,8 +521,8 @@ static void update_image_params(struct dec_video *vd, AVFrame *frame, .gamma = avcol_trc_to_mp_csp_trc(ctx->avctx->color_trc), .chroma_location = avchroma_location_to_mp(ctx->avctx->chroma_sample_location), - .rotate = vd->header->codec->rotate, - .stereo_in = vd->header->codec->stereo_mode, + .rotate = vd->codec->rotate, + .stereo_in = vd->codec->stereo_mode, }; if (opts->video_rotate < 0) { |