virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

lavc/takdec: s/get_b/get_bits_esc4

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-12-07 15:17:15 +00:00
parent 4ed0c35c40
commit 6777aa6387
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/takdec.c
View File

@ -389,7 +389,7 @@ static int decode_coeffs(TAKDecContext *s, int32_t *dst, int length)
return 0; return 0;
} }
static int get_b(GetBitContext *gb) static int get_bits_esc4(GetBitContext *gb)
{ {
if (get_bits1(gb)) if (get_bits1(gb))
return get_bits(gb, 4) + 1; return get_bits(gb, 4) + 1;
@ -432,7 +432,7 @@ static int decode_subframe(TAKDecContext *s, int32_t *ptr, int subframe_size,
decode_lpc(ptr, lpc, s->filter_order); decode_lpc(ptr, lpc, s->filter_order);
} }
s->xred = get_b(gb); s->xred = get_bits_esc4(gb);
s->size = get_bits1(gb) + 5; s->size = get_bits1(gb) + 5;
if (get_bits1(gb)) { if (get_bits1(gb)) {
@ -546,7 +546,7 @@ static int decode_channel(TAKDecContext *s, int chan)
int i = 0, ret, prev = 0; int i = 0, ret, prev = 0;
int left = s->nb_samples - 1; int left = s->nb_samples - 1;
s->sample_shift[chan] = get_b(gb); s->sample_shift[chan] = get_bits_esc4(gb);
if (s->sample_shift[chan] >= avctx->bits_per_raw_sample) if (s->sample_shift[chan] >= avctx->bits_per_raw_sample)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -593,7 +593,7 @@ static int decorrelate(TAKDecContext *s, int c1, int c2, int length)
int a, b, i, x, tmp; int a, b, i, x, tmp;
if (s->dmode > 3) { if (s->dmode > 3) {
s->dshift = get_b(gb); s->dshift = get_bits_esc4(gb);
if (s->dmode > 5) { if (s->dmode > 5) {
if (get_bits1(gb)) if (get_bits1(gb))
s->filter_order = 16; s->filter_order = 16;