# HG changeset patch # User michael # Date 1106617258 0 # Node ID ab390f13c7f5739fc954f98efa4411046230a023 # Parent 9baa47d8297b79c7a0b41474cfc0603936739f78 dont duplicate decode012() diff -r 9baa47d8297b -r ab390f13c7f5 bitstream.h --- a/bitstream.h Tue Jan 25 01:29:10 2005 +0000 +++ b/bitstream.h Tue Jan 25 01:40:58 2005 +0000 @@ -824,4 +824,13 @@ #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 -r 9baa47d8297b -r ab390f13c7f5 msmpeg4.c --- a/msmpeg4.c Tue Jan 25 01:29:10 2005 +0000 +++ b/msmpeg4.c Tue Jan 25 01:40:58 2005 +0000 @@ -1195,16 +1195,6 @@ 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 -r 9baa47d8297b -r ab390f13c7f5 vc9.c --- a/vc9.c Tue Jan 25 01:29:10 2005 +0000 +++ b/vc9.c Tue Jan 25 01:40:58 2005 +0000 @@ -299,16 +299,6 @@ #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;