mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-04-02 20:35:37 +02:00
dont duplicate decode012()
Originally committed as revision 3884 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
6b250f09e8
commit
a64a006e95
@ -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)
|
|||||||
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)
|
|||||||
#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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user