From 9c0aba434e774f9d8d99d6d3c4adc8dcabf3a052 Mon Sep 17 00:00:00 2001 From: Rostislav Pehlivanov Date: Wed, 13 Jul 2016 23:38:10 +0100 Subject: dirac_vlc: remove redundant macro declaration Signed-off-by: Rostislav Pehlivanov --- libavcodec/dirac_vlc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libavcodec/dirac_vlc.c') diff --git a/libavcodec/dirac_vlc.c b/libavcodec/dirac_vlc.c index caa6413e76..74cf4a26a5 100644 --- a/libavcodec/dirac_vlc.c +++ b/libavcodec/dirac_vlc.c @@ -31,6 +31,10 @@ residual N = B ? CONVERT_TO_RESIDUE(I, B) : 0; \ av_unused int32_t N ## _bits = B +#define APPEND_RESIDUE(N, M) \ + N |= M >> (N ## _bits); \ + N ## _bits += (M ## _bits) + int ff_dirac_golomb_read_32bit(DiracGolombLUT *lut_ctx, const uint8_t *buf, int bytes, uint8_t *_dst, int coeffs) { @@ -39,10 +43,6 @@ int ff_dirac_golomb_read_32bit(DiracGolombLUT *lut_ctx, const uint8_t *buf, DiracGolombLUT *future[4], *l = &lut_ctx[2*LUT_SIZE + buf[0]]; INIT_RESIDUE(res, 0, 1); -#define APPEND_RESIDUE(N, M) \ - N |= M >> (N ## _bits); \ - N ## _bits += (M ## _bits) - for (b = 1; b <= bytes; b++) { future[0] = &lut_ctx[buf[b]]; future[1] = future[0] + 1*LUT_SIZE; @@ -83,10 +83,6 @@ int ff_dirac_golomb_read_16bit(DiracGolombLUT *lut_ctx, const uint8_t *buf, DiracGolombLUT *future[4], *l = &lut_ctx[2*LUT_SIZE + buf[0]]; INIT_RESIDUE(res, 0, 1); -#define APPEND_RESIDUE(N, M) \ - N |= M >> (N ## _bits); \ - N ## _bits += (M ## _bits) - for (b = 1; b <= bytes; b++) { future[0] = &lut_ctx[buf[b]]; future[1] = future[0] + 1*LUT_SIZE; -- cgit v1.2.3