diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:14:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 15:14:52 +0100 |
| commit | 64a0ed190efa4c8d1514a7d258ab533b340408d8 (patch) | |
| tree | 9574586d8083d3a2184b221c3a15d697020f8844 /libavcodec/mpeg4video_parser.c | |
| parent | bf92cd8178e0553a27971118e2b2b9e87e7b810b (diff) | |
| parent | 13207484bba8a8b78b40d5a22da8c9c555429089 (diff) | |
| download | ffmpeg-64a0ed190efa4c8d1514a7d258ab533b340408d8.tar.gz | |
Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
mpeg4video_parser: stop using deprecated avcodec_set_dimensions
mpeg12dec: stop using deprecated avcodec_set_dimensions
mjpegdec: stop using deprecated avcodec_set_dimensions
libvpxdec: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
| -rw-r--r-- | libavcodec/mpeg4video_parser.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index b3cbf919c5..78992b9c62 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -22,6 +22,7 @@ #define UNCHECKED_BITSTREAM_READER 1 +#include "internal.h" #include "parser.h" #include "mpegvideo.h" #include "mpeg4video.h" @@ -91,7 +92,9 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1, init_get_bits(gb, buf, 8 * buf_size); ret = ff_mpeg4_decode_picture_header(s, gb); if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; } if((s1->flags & PARSER_FLAG_USE_CODEC_TS) && s->avctx->time_base.den>0 && ret>=0){ av_assert1(s1->pts == AV_NOPTS_VALUE); |