From a64a006e95a674a6e257daa89b0eb2b74a26ec22 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 25 Jan 2005 01:40:58 +0000
Subject: [PATCH] dont duplicate decode012()
Originally committed as revision 3884 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/bitstream.h | 9 +++++++++
libavcodec/msmpeg4.c | 10 ----------
libavcodec/vc9.c | 10 ----------
3 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 5a9621d9b63..fa4f6f576e7 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 a22631c222d..e839b3fdb18 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 a0e22c20780..30c8e963e1c 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;
--
GitLab