Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'

* commit '263efc095e6c7ec2902119118b084cea29ea8916': jfdct: Kill broken cruft Merged-by: Clément Bœsch <u@pkh.me>
8 years ago · 92cd2c04b1
parent 3eed90b1ed 263efc095e
commit 92cd2c04b1
1 changed files with 0 additions and 5 deletions
--- 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


 /*