[FFmpeg-cvslog] r24051 - trunk/libavcodec/dca.c

[banan]

Author: banan
Date: Mon Jul  5 03:43:47 2010
New Revision: 24051

Log:
DCA: *_bits() -> *_bits_long() where needed, half fix for broken bitstream parsing

Modified:
   trunk/libavcodec/dca.c

Modified: trunk/libavcodec/dca.c
==============================================================================
--- trunk/libavcodec/dca.c	Sun Jul  4 22:59:02 2010	(r24050)
+++ trunk/libavcodec/dca.c	Mon Jul  5 03:43:47 2010	(r24051)
@@ -1290,10 +1290,10 @@ static int dca_decode_frame(AVCodecConte
     num_core_channels = s->prim_channels;
 
     /* extensions start at 32-bit boundaries into bitstream */
-    skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 31);
+    skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);
 
     while(get_bits_left(&s->gb) >= 32) {
-        uint32_t bits = get_bits(&s->gb, 32);
+        uint32_t bits = get_bits_long(&s->gb, 32);
 
         switch(bits) {
         case 0x5a5a5a5a: {
@@ -1328,7 +1328,7 @@ static int dca_decode_frame(AVCodecConte
             break;
         }
 
-        skip_bits(&s->gb, (-get_bits_count(&s->gb)) & 31);
+        skip_bits_long(&s->gb, (-get_bits_count(&s->gb)) & 31);
     }
 
     channels = s->prim_channels + !!s->lfe;