[SCM] libav/experimental: add support for files that do not allow more than 4 subframes

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit b86dd1bf6d265efe490be91b5a77aaba7a35e755
Author: Sascha Sommer <saschasommer at freenet.de>
Date:   Sat Jan 8 15:38:14 2011 +0000

    add support for files that do not allow more than 4 subframes
    
    Originally committed as revision 26267 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 62e36e2..0e5ad56 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -311,7 +311,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
     /** subframe info */
     log2_max_num_subframes       = ((s->decode_flags & 0x38) >> 3);
     s->max_num_subframes         = 1 << log2_max_num_subframes;
-    if (s->max_num_subframes == 16)
+    if (s->max_num_subframes == 16 || s->max_num_subframes == 4)
         s->max_subframe_len_bit = 1;
     s->subframe_len_bits = av_log2(log2_max_num_subframes) + 1;
 

-- 
Libav/FFmpeg packaging