diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2005-01-25 01:40:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-01-25 01:40:58 +0000 |
| commit | a64a006e95a674a6e257daa89b0eb2b74a26ec22 (patch) | |
| tree | d213ab74d13227fd4dbaa4b450db198bb1324932 /libavcodec | |
| parent | 6b250f09e803975ae5aa3fce79a3960b5b05469a (diff) | |
| download | ffmpeg-a64a006e95a674a6e257daa89b0eb2b74a26ec22.tar.gz | |
dont duplicate decode012()
Originally committed as revision 3884 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/bitstream.h | 9 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.c | 10 | ||||
| -rw-r--r-- | libavcodec/vc9.c | 10 |
3 files changed, 9 insertions, 20 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 5a9621d9b6..fa4f6f576e 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 a22631c222..e839b3fdb1 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 a0e22c2078..30c8e963e1 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; |