Browse Source

dont duplicate decode012()

Originally committed as revision 3884 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 21 years ago
parent
commit
a64a006e95
3 changed files with 9 additions and 20 deletions
  1. +9
    -0
      libavcodec/bitstream.h
  2. +0
    -10
      libavcodec/msmpeg4.c
  3. +0
    -10
      libavcodec/vc9.c

+ 9
- 0
libavcodec/bitstream.h View File

@@ -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 */

+ 0
- 10
libavcodec/msmpeg4.c View File

@@ -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;


+ 0
- 10
libavcodec/vc9.c View File

@@ -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;


Loading…
Cancel
Save