diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-12-05 03:53:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-12-05 03:53:12 +0000 |
| commit | 442d7dd85232042260ab8bff3622dced310a7ed9 (patch) | |
| tree | 722175389e88f8c81222418e53e1b0e3d5c86f4b /libavcodec/mpeg4video_parser.c | |
| parent | 11f6d0982cd5a05750c1d057684c324b8be972b1 (diff) | |
| download | ffmpeg-442d7dd85232042260ab8bff3622dced310a7ed9.tar.gz | |
Make sure the parsers do not overwrite width/height as this can interfere
with the decoder.
Fixes issue1135.
Originally committed as revision 20736 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
| -rw-r--r-- | libavcodec/mpeg4video_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c index 06094c6f54..cb20af4250 100644 --- a/libavcodec/mpeg4video_parser.c +++ b/libavcodec/mpeg4video_parser.c @@ -82,7 +82,7 @@ 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) { + if (s->width && (!avctx->width || !avctx->height || !avctx->coded_width || !avctx->coded_height)) { avcodec_set_dimensions(avctx, s->width, s->height); } s1->pict_type= s->pict_type; |