[FFmpeg-cvslog] r18819 - in trunk: libavcodec/mpc7.c libavcodec/nellymoserdec.c libavcodec/vp3.c libavformat/oggparsetheora.c

[conrad]

Author: conrad
Date: Thu May 14 02:02:07 2009
New Revision: 18819

Log:
Use skip_bits_long() for large skips
This fixes ogg/theora on ARM (more generally the A32 bitstream reader)

Modified:
   trunk/libavcodec/mpc7.c
   trunk/libavcodec/nellymoserdec.c
   trunk/libavcodec/vp3.c
   trunk/libavformat/oggparsetheora.c

Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c	Thu May 14 00:59:58 2009	(r18818)
+++ trunk/libavcodec/mpc7.c	Thu May 14 02:02:07 2009	(r18819)
@@ -78,7 +78,7 @@ static av_cold int mpc7_decode_init(AVCo
         av_log(avctx, AV_LOG_ERROR, "Too many bands: %i\n", c->maxbands);
         return -1;
     }
-    skip_bits(&gb, 88);
+    skip_bits_long(&gb, 88);
     c->gapless = get_bits1(&gb);
     c->lastframelen = get_bits(&gb, 11);
     av_log(avctx, AV_LOG_DEBUG, "IS: %d, MSS: %d, TG: %d, LFL: %d, bands: %d\n",

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	Thu May 14 00:59:58 2009	(r18818)
+++ trunk/libavcodec/nellymoserdec.c	Thu May 14 02:02:07 2009	(r18819)
@@ -103,7 +103,7 @@ static void nelly_decode_block(NellyMose
         aptr = audio + i * NELLY_BUF_LEN;
 
         init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8);
-        skip_bits(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS);
+        skip_bits_long(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS);
 
         for (j = 0; j < NELLY_FILL_LEN; j++) {
             if (bits[j] <= 0) {

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	Thu May 14 00:59:58 2009	(r18818)
+++ trunk/libavcodec/vp3.c	Thu May 14 02:02:07 2009	(r18819)
@@ -2243,7 +2243,7 @@ static av_cold int theora_decode_init(AV
      }
 
     // FIXME: Check for this as well.
-    skip_bits(&gb, 6*8); /* "theora" */
+    skip_bits_long(&gb, 6*8); /* "theora" */
 
     switch(ptype)
     {

Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c	Thu May 14 00:59:58 2009	(r18818)
+++ trunk/libavformat/oggparsetheora.c	Thu May 14 02:02:07 2009	(r18819)
@@ -58,7 +58,7 @@ theora_header (AVFormatContext * s, int 
 
         init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
 
-        skip_bits(&gb, 7*8); /* 0x80"theora" */
+        skip_bits_long(&gb, 7*8); /* 0x80"theora" */
 
         thp->version = get_bits_long(&gb, 24);
         if (thp->version < 0x030100)
@@ -92,7 +92,7 @@ theora_header (AVFormatContext * s, int 
         st->sample_aspect_ratio.den = get_bits_long(&gb, 24);
 
         if (thp->version >= 0x030200)
-            skip_bits(&gb, 38);
+            skip_bits_long(&gb, 38);
         if (thp->version >= 0x304000)
             skip_bits(&gb, 2);