[FFmpeg-devel] [PATCH] move decode210 to bitstream.h

Kostya kostya.shishkov
Wed Jan 2 17:57:24 CET 2008


$subj
Have been forgetting to send it for some time.
-------------- next part --------------
Index: libavcodec/rv34.c
===================================================================
--- libavcodec/rv34.c	(revision 11361)
+++ libavcodec/rv34.c	(working copy)
@@ -359,13 +359,6 @@
  * @{
  */
 
-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() ?
Index: libavcodec/vc1.c
===================================================================
--- libavcodec/vc1.c	(revision 11264)
+++ libavcodec/vc1.c	(working copy)
@@ -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
Index: libavcodec/bitstream.h
===================================================================
--- libavcodec/bitstream.h	(revision 11264)
+++ libavcodec/bitstream.h	(working copy)
@@ -950,4 +950,11 @@
         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 */



More information about the ffmpeg-devel mailing list