Commit 66128b21 authored by michael's avatar michael

dont duplicate decode012()


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3884 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 611add09
...@@ -824,4 +824,13 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file, const cha ...@@ -824,4 +824,13 @@ static inline int get_xbits_trace(GetBitContext *s, int n, char *file, const cha
#define tprintf(...) {} #define tprintf(...) {}
#endif #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 */ #endif /* BITSTREAM_H */
...@@ -1195,16 +1195,6 @@ int ff_msmpeg4_decode_init(MpegEncContext *s) ...@@ -1195,16 +1195,6 @@ int ff_msmpeg4_decode_init(MpegEncContext *s)
return 0; 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 msmpeg4_decode_picture_header(MpegEncContext * s)
{ {
int code; int code;
......
...@@ -299,16 +299,6 @@ static int get_prefix(GetBitContext *gb, int stop, int len) ...@@ -299,16 +299,6 @@ static int get_prefix(GetBitContext *gb, int stop, int len)
#endif #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 init_common(VC9Context *v)
{ {
static int done = 0; static int done = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment