[SCM] libav/experimental: emulate (idiotic) MS behavior for inconsistant dimensions

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3f26d68aecb1cec054cde548e341ffaf82fa2748
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Feb 6 18:43:06 2005 +0000

    emulate (idiotic) MS behavior for inconsistant dimensions
    
    Originally committed as revision 3940 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 4adc362..ad49634 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -5538,7 +5538,7 @@ static int decode_vol_header(MpegEncContext *s, GetBitContext *gb){
             skip_bits1(gb);   /* marker */
             height = get_bits(gb, 13);
             skip_bits1(gb);   /* marker */
-            if(width && height){ /* they should be non zero but who knows ... */
+            if(width && height && !(s->width && s->avctx->codec_tag == ff_get_fourcc("MP4S"))){ /* they should be non zero but who knows ... */
                 s->width = width;
                 s->height = height;
 //                printf("width/height: %d %d\n", width, height);

-- 
Libav/FFmpeg packaging