From 904c73d2d214c729fbeedc13c8b47afab91e296b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 23 Nov 2013 21:37:56 +0100 Subject: 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. --- video/decode/vd_lavc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/decode/vd_lavc.c') 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; } -- cgit v1.2.3