[FFmpeg-cvslog] r11382 - in trunk/libavcodec: bitstream.h rv34.c vc1.c

kostya subversion
Thu Jan 3 10:16:56 CET 2008


Author: kostya
Date: Thu Jan  3 10:16:56 2008
New Revision: 11382

Log:
Make decode210() common function.

Modified:
   trunk/libavcodec/bitstream.h
   trunk/libavcodec/rv34.c
   trunk/libavcodec/vc1.c

Modified: trunk/libavcodec/bitstream.h
==============================================================================
--- trunk/libavcodec/bitstream.h	(original)
+++ trunk/libavcodec/bitstream.h	Thu Jan  3 10:16:56 2008
@@ -950,4 +950,11 @@ static inline int decode012(GetBitContex
         return get_bits1(gb) + 1;
 }
 
+static inline int decode210(GetBitContext *gb){
+    if (get_bits1(gb))
+        return 0;
+    else
+        return 2 - get_bits1(gb);
+}
+
 #endif /* FFMPEG_BITSTREAM_H */

Modified: trunk/libavcodec/rv34.c
==============================================================================
--- trunk/libavcodec/rv34.c	(original)
+++ trunk/libavcodec/rv34.c	Thu Jan  3 10:16:56 2008
@@ -359,13 +359,6 @@ static inline void rv34_dequant4x4_16x16
  * @{
  */
 
-static inline int decode210(GetBitContext *gb){
-    if (get_bits1(gb))
-        return 0;
-    else
-        return 2 - get_bits1(gb);
-}
-
 /**
  * Decode starting slice position.
  * @todo Maybe replace with ff_h263_decode_mba() ?

Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	(original)
+++ trunk/libavcodec/vc1.c	Thu Jan  3 10:16:56 2008
@@ -44,13 +44,6 @@
 static const uint16_t table_mb_intra[64][2];
 
 
-static inline int decode210(GetBitContext *gb){
-    if (get_bits1(gb))
-        return 0;
-    else
-        return 2 - get_bits1(gb);
-}
-
 /**
  * Init VC-1 specific tables and VC1Context members
  * @param v The VC1Context to initialize




More information about the ffmpeg-cvslog mailing list