[FFmpeg-cvslog] avcodec/mpegvideo: set codec tags in ff_mpv_decode_init()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep  5 17:14:50 2014 +0200| [dcb29d37d4ffedc84e44df99f8d22ecf27e0f2cd] | committer: Michael Niedermayer

avcodec/mpegvideo: set codec tags in ff_mpv_decode_init()

Fixes Ticket3912

Reviewed-by: Benoit Fouet <benoit.fouet at free.fr>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dcb29d37d4ffedc84e44df99f8d22ecf27e0f2cd
---

 libavcodec/mpegvideo.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f5306cb..41a8799 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);