[SCM] libav/experimental: fix SHOW_SBITS for ALT_BITSTREAM_READER_LE, patch by Gregory Montoir %cyx A users P sourceforge P net%

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:52:11 UTC 2013


The following commit has been merged in the experimental branch:
commit 7da4d4cdeca48667378b96a451621fc9aa76664b
Author: Gregory Montoir <cyx at users.sourceforge.net>
Date:   Thu Oct 12 11:54:24 2006 +0000

    fix SHOW_SBITS for ALT_BITSTREAM_READER_LE, patch by Gregory Montoir %cyx A users P sourceforge P net%
    
    Originally committed as revision 6671 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index d17c4b3..a00e117 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -460,13 +460,16 @@ static inline int unaligned32_le(const void *v)
 # ifdef ALT_BITSTREAM_READER_LE
 #   define SHOW_UBITS(name, gb, num)\
         ((name##_cache) & (NEG_USR32(0xffffffff,num)))
+
+#   define SHOW_SBITS(name, gb, num)\
+        NEG_SSR32((name##_cache)<<(32-(num)), num)
 # else
 #   define SHOW_UBITS(name, gb, num)\
         NEG_USR32(name##_cache, num)
-# endif
 
 #   define SHOW_SBITS(name, gb, num)\
         NEG_SSR32(name##_cache, num)
+# endif
 
 #   define GET_CACHE(name, gb)\
         ((uint32_t)name##_cache)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list