diff options
author | wm4 <wm4@nowhere> | 2013-11-23 21:37:56 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-23 21:37:56 +0100 |
commit | 904c73d2d214c729fbeedc13c8b47afab91e296b (patch) | |
tree | 0b903a73ac8f0c3239f5cb52459f203dce866b16 /video/decode | |
parent | 639e672bd153e06cfc01ced6c2a48b45870e8f31 (diff) | |
download | mpv-904c73d2d214c729fbeedc13c8b47afab91e296b.tar.bz2 mpv-904c73d2d214c729fbeedc13c8b47afab91e296b.tar.xz |
demux: remove gsh field from sh_audio/sh_video/sh_sub
This used to be needed to access the generic stream header from the
specific headers, which in turn was needed because the decoders had
access only to the specific headers. This is not the case anymore, so
this can finally be removed again.
Also move the "format" field from the specific headers to sh_stream.
Diffstat (limited to 'video/decode')
-rw-r--r-- | video/decode/vd_lavc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index f7768f130f..37c94fa881 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -454,16 +454,16 @@ static void init_avctx(struct dec_video *vd, const char *decoder, // Do this after the above avopt handling in case it changes values ctx->skip_frame = avctx->skip_frame; - avctx->codec_tag = sh->video->format; + avctx->codec_tag = sh->format; avctx->coded_width = sh->video->disp_w; avctx->coded_height = sh->video->disp_h; // demux_mkv if (sh->video->bih) - set_from_bih(avctx, sh->video->format, sh->video->bih); + set_from_bih(avctx, sh->format, sh->video->bih); if (mp_rawvideo) { - avctx->pix_fmt = imgfmt2pixfmt(sh->video->format); + avctx->pix_fmt = imgfmt2pixfmt(sh->format); avctx->codec_tag = 0; } |