RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/wavpackenc: fix () in macros 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-20 18:48:20 +02:00
parent 10b8481a26
commit 40cbad9ff7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/wavpackenc.c
View File

@ -30,17 +30,17 @@
#include "wavpack.h" #include "wavpack.h"
#define UPDATE_WEIGHT(weight, delta, source, result) \ #define UPDATE_WEIGHT(weight, delta, source, result) \
if (source && result) { \ if ((source) && (result)) { \
int32_t s = (int32_t) (source ^ result) >> 31; \ int32_t s = (int32_t) ((source) ^ (result)) >> 31; \
weight = (delta ^ s) + (weight - s); \ weight = ((delta) ^ s) + ((weight) - s); \
} }
#define APPLY_WEIGHT_F(weight, sample) (((((sample & 0xffff) * weight) >> 9) + \ #define APPLY_WEIGHT_F(weight, sample) ((((((sample) & 0xffff) * (weight)) >> 9) + \
(((sample & ~0xffff) >> 9) * weight) + 1) >> 1) ((((sample) & ~0xffff) >> 9) * (weight)) + 1) >> 1)
#define APPLY_WEIGHT_I(weight, sample) ((weight * sample + 512) >> 10) #define APPLY_WEIGHT_I(weight, sample) (((weight) * (sample) + 512) >> 10)
#define APPLY_WEIGHT(weight, sample) (sample != (short) sample ? \ #define APPLY_WEIGHT(weight, sample) ((sample) != (short) (sample) ? \
APPLY_WEIGHT_F(weight, sample) : APPLY_WEIGHT_I (weight, sample)) APPLY_WEIGHT_F(weight, sample) : APPLY_WEIGHT_I (weight, sample))
#define CLEAR(destin) memset(&destin, 0, sizeof(destin)); #define CLEAR(destin) memset(&destin, 0, sizeof(destin));