changeset 6099:a2b438bcb1d2 libavcodec

Make decode210() common function.
author kostya
date Thu, 03 Jan 2008 09:16:56 +0000
parents b7905ea98b8f
children a5dee59b5918
files bitstream.h rv34.c vc1.c
diffstat 3 files changed, 7 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/bitstream.h	Thu Jan 03 02:26:29 2008 +0000
+++ b/bitstream.h	Thu Jan 03 09:16:56 2008 +0000
@@ -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 */
--- a/rv34.c	Thu Jan 03 02:26:29 2008 +0000
+++ b/rv34.c	Thu Jan 03 09:16:56 2008 +0000
@@ -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() ?
--- a/vc1.c	Thu Jan 03 02:26:29 2008 +0000
+++ b/vc1.c	Thu Jan 03 09:16:56 2008 +0000
@@ -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