From dcb29d37d4ffedc84e44df99f8d22ecf27e0f2cd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 5 Sep 2014 17:14:50 +0200 Subject: avcodec/mpegvideo: set codec tags in ff_mpv_decode_init() Fixes Ticket3912 Reviewed-by: Benoit Fouet Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f5306cb3b2..41a879915d 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1119,6 +1119,10 @@ void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx) s->flags = avctx->flags; s->flags2 = avctx->flags2; + /* convert fourcc to upper case */ + s->codec_tag = avpriv_toupper4(avctx->codec_tag); + + s->stream_codec_tag = avpriv_toupper4(avctx->stream_codec_tag); } static int init_er(MpegEncContext *s) @@ -1331,10 +1335,6 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) &s->chroma_x_shift, &s->chroma_y_shift); - /* convert fourcc to upper case */ - s->codec_tag = avpriv_toupper4(s->avctx->codec_tag); - - s->stream_codec_tag = avpriv_toupper4(s->avctx->stream_codec_tag); FF_ALLOCZ_OR_GOTO(s->avctx, s->picture, MAX_PICTURE_COUNT * sizeof(Picture), fail); -- cgit v1.2.3