virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

dirac_vlc: remove redundant macro declaration

Browse Source 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2016-07-13 23:38:10 +01:00
parent e24c31b656
commit 9c0aba434e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/dirac_vlc.c
View File

@ -31,6 +31,10 @@
residual N = B ? CONVERT_TO_RESIDUE(I, B) : 0; \ residual N = B ? CONVERT_TO_RESIDUE(I, B) : 0; \
av_unused int32_t N ## _bits = B 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 ff_dirac_golomb_read_32bit(DiracGolombLUT *lut_ctx, const uint8_t *buf,
int bytes, uint8_t *_dst, int coeffs) 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]]; DiracGolombLUT *future[4], *l = &lut_ctx[2*LUT_SIZE + buf[0]];
INIT_RESIDUE(res, 0, 1); INIT_RESIDUE(res, 0, 1);
#define APPEND_RESIDUE(N, M) \
N |= M >> (N ## _bits); \
N ## _bits += (M ## _bits)
for (b = 1; b <= bytes; b++) { for (b = 1; b <= bytes; b++) {
future[0] = &lut_ctx[buf[b]]; future[0] = &lut_ctx[buf[b]];
future[1] = future[0] + 1*LUT_SIZE; 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]]; DiracGolombLUT *future[4], *l = &lut_ctx[2*LUT_SIZE + buf[0]];
INIT_RESIDUE(res, 0, 1); INIT_RESIDUE(res, 0, 1);
#define APPEND_RESIDUE(N, M) \
N |= M >> (N ## _bits); \
N ## _bits += (M ## _bits)
for (b = 1; b <= bytes; b++) { for (b = 1; b <= bytes; b++) {
future[0] = &lut_ctx[buf[b]]; future[0] = &lut_ctx[buf[b]];
future[1] = future[0] + 1*LUT_SIZE; future[1] = future[0] + 1*LUT_SIZE;