diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2016-07-13 23:38:10 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2016-07-13 23:38:10 +0100 |
| commit | 9c0aba434e774f9d8d99d6d3c4adc8dcabf3a052 (patch) | |
| tree | 09df62d1e83adbc047bc3bd468b33d65740e6971 /libavcodec/dirac_vlc.c | |
| parent | e24c31b656254b2516befbde78aeaca0122a6010 (diff) | |
| download | ffmpeg-9c0aba434e774f9d8d99d6d3c4adc8dcabf3a052.tar.gz | |
dirac_vlc: remove redundant macro declaration
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Diffstat (limited to 'libavcodec/dirac_vlc.c')
| -rw-r--r-- | libavcodec/dirac_vlc.c | 12 |
1 files changed, 4 insertions, 8 deletions
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; |