diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-19 15:50:17 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-19 15:50:17 +0100 |
| commit | 92cd2c04b1c255a40cfb27732aad4bc78211cd93 (patch) | |
| tree | cf790acc85f5bf68a51c3d7bdf3abe2581b6e2f8 /libavcodec | |
| parent | 3eed90b1ed6cd0d8fb2b3fbf665dd2504aaf5384 (diff) | |
| parent | 263efc095e6c7ec2902119118b084cea29ea8916 (diff) | |
| download | ffmpeg-92cd2c04b1c255a40cfb27732aad4bc78211cd93.tar.gz | |
Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'
* commit '263efc095e6c7ec2902119118b084cea29ea8916':
jfdct: Kill broken cruft
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jfdctint_template.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c index 3ea2f5dadc..67fb77b5e1 100644 --- a/libavcodec/jfdctint_template.c +++ b/libavcodec/jfdctint_template.c @@ -69,12 +69,7 @@ #define GLOBAL(x) x #define RIGHT_SHIFT(x, n) ((x) >> (n)) #define MULTIPLY16C16(var,const) ((var)*(const)) - -#if 1 //def USE_ACCURATE_ROUNDING #define DESCALE(x,n) RIGHT_SHIFT((x) + (1 << ((n) - 1)), n) -#else -#define DESCALE(x,n) RIGHT_SHIFT(x, n) -#endif /* |