RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 04:47:12 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/mpegvideo: set codec tags in ff_mpv_decode_init()

Browse Source 
Fixes Ticket3912

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-05 17:14:50 +02:00
parent 4dee4a4470
commit dcb29d37d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo.c
View File

@ -1119,6 +1119,10 @@ void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx)
s->flags = avctx->flags; s->flags = avctx->flags;
s->flags2 = avctx->flags2; 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) 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_x_shift,
&s->chroma_y_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, FF_ALLOCZ_OR_GOTO(s->avctx, s->picture,
MAX_PICTURE_COUNT * sizeof(Picture), fail); MAX_PICTURE_COUNT * sizeof(Picture), fail);