[SCM] libav/experimental: dont duplicate decode012()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a64a006e95a674a6e257daa89b0eb2b74a26ec22
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jan 25 01:40:58 2005 +0000

    dont duplicate decode012()
    
    Originally committed as revision 3884 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 5a9621d..fa4f6f5 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -824,4 +824,13 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file, const cha
 #define tprintf(...) {}
 #endif
 
+static int decode012(GetBitContext *gb){
+    int n;
+    n = get_bits1(gb);
+    if (n == 0)
+        return 0;
+    else
+        return get_bits1(gb) + 1;
+}
+
 #endif /* BITSTREAM_H */
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index a22631c..e839b3f 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -1195,16 +1195,6 @@ int ff_msmpeg4_decode_init(MpegEncContext *s)
     return 0;
 }
 
-static int decode012(GetBitContext *gb)
-{
-    int n;
-    n = get_bits1(gb);
-    if (n == 0)
-        return 0;
-    else
-        return get_bits1(gb) + 1;
-}
-
 int msmpeg4_decode_picture_header(MpegEncContext * s)
 {
     int code;
diff --git a/libavcodec/vc9.c b/libavcodec/vc9.c
index a0e22c2..30c8e96 100644
--- a/libavcodec/vc9.c
+++ b/libavcodec/vc9.c
@@ -299,16 +299,6 @@ static int get_prefix(GetBitContext *gb, int stop, int len)
 #endif
 }
 
-static int decode012(GetBitContext *gb)
-{
-    int n;
-    n = get_bits1(gb);
-    if (n == 0)
-        return 0;
-    else
-        return get_bits1(gb) + 1;
-}
-
 static int init_common(VC9Context *v)
 {
     static int done = 0;

-- 
Libav/FFmpeg packaging