[FFmpeg-soc] [soc]: r4905 - wmapro/wmaprodec.c

faust3 subversion at mplayerhq.hu
Sun Aug 2 13:16:28 CEST 2009


Author: faust3
Date: Sun Aug  2 13:16:28 2009
New Revision: 4905

Log:
remove subframe_len_bits special casing

Modified:
   wmapro/wmaprodec.c

Modified: wmapro/wmaprodec.c
==============================================================================
--- wmapro/wmaprodec.c	Sun Aug  2 13:06:37 2009	(r4904)
+++ wmapro/wmaprodec.c	Sun Aug  2 13:16:28 2009	(r4905)
@@ -520,11 +520,11 @@ static int decode_tilehdr(WMA3DecodeCont
         /** calculate subframe len bits */
         if (s->lossless) {
             subframe_len_bits = av_log2(s->max_num_subframes - 1) + 1;
-        } else if (s->max_num_subframes == 16) {
-            subframe_len_zero_bit = 1;
-            subframe_len_bits = 3;
-        } else
+        } else {
+            if (s->max_num_subframes == 16)
+                subframe_len_zero_bit = 1;
             subframe_len_bits = av_log2(av_log2(s->max_num_subframes)) + 1;
+        }
 
         /** loop until the frame data is split between the subframes */
         while (missing_samples > 0) {


More information about the FFmpeg-soc mailing list