Mercurial > libavcodec.hg

diff mpeg4video_parser.c @ 10641:9311c65558c0 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure the parsers do not overwrite width/height as this can interfere with the decoder. Fixes issue1135.
author michael
date Sat, 05 Dec 2009 03:53:12 +0000
parents 043574c5c153
children 20752e8b2657
line wrap: on
line diff
--- a/mpeg4video_parser.c	Fri Dec 04 23:16:27 2009 +0000
+++ b/mpeg4video_parser.c	Sat Dec 05 03:53:12 2009 +0000
@@ -82,7 +82,7 @@
 
     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;