diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-12-07 15:17:15 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-12-07 15:19:49 +0000 |
| commit | 6777aa638791d9a95efc5f7cddba7103fbb309b1 (patch) | |
| tree | fc0b2129b63b32b8201c8f3023310650a01460c4 /libavcodec/takdec.c | |
| parent | 4ed0c35c40b7be19d892f48c35743a642757ac87 (diff) | |
| download | ffmpeg-6777aa638791d9a95efc5f7cddba7103fbb309b1.tar.gz | |
lavc/takdec: s/get_b/get_bits_esc4
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/takdec.c')
| -rw-r--r-- | libavcodec/takdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 85cf1093e1..12e7bcb126 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -389,7 +389,7 @@ static int decode_coeffs(TAKDecContext *s, int32_t *dst, int length) return 0; } -static int get_b(GetBitContext *gb) +static int get_bits_esc4(GetBitContext *gb) { if (get_bits1(gb)) 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); } - s->xred = get_b(gb); + s->xred = get_bits_esc4(gb); s->size = get_bits1(gb) + 5; if (get_bits1(gb)) { @@ -546,7 +546,7 @@ static int decode_channel(TAKDecContext *s, int chan) int i = 0, ret, prev = 0; 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) return AVERROR_INVALIDDATA; @@ -593,7 +593,7 @@ static int decorrelate(TAKDecContext *s, int c1, int c2, int length) int a, b, i, x, tmp; if (s->dmode > 3) { - s->dshift = get_b(gb); + s->dshift = get_bits_esc4(gb); if (s->dmode > 5) { if (get_bits1(gb)) s->filter_order = 16; |