[Ffmpeg-cvslog] r7440 - trunk/libavcodec/h264.c

michael subversion
Sat Jan 13 01:56:43 CET 2007


Author: michael
Date: Sat Jan 13 01:56:43 2007
New Revision: 7440

Modified:
   trunk/libavcodec/h264.c

Log:
fix 16 CABAC_BIT * 10l bug introduced in r6578


Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Sat Jan 13 01:56:43 2007
@@ -6224,7 +6224,10 @@
         // FIXME The two following lines get the bitstream position in the cabac
         // decode, I think it should be done by a function in cabac.h (or cabac.c).
         ptr= h->cabac.bytestream;
-        if (h->cabac.low&0x1) ptr-=CABAC_BITS/8;
+        if(h->cabac.low&0x1) ptr--;
+        if(CABAC_BITS==16){
+            if(h->cabac.low&0x1FF) ptr--;
+        }
 
         // The pixels are stored in the same order as levels in h->mb array.
         for(y=0; y<16; y++){




More information about the ffmpeg-cvslog mailing list