Merge commit '263efc09'

* commit '263efc09': jfdct: Kill broken cruft Merged-by: Clément Bœsch <u@pkh.me>

Merge commit '263efc09'
* commit '263efc09': jfdct: Kill broken cruft Merged-by: Clément Bœsch <u@pkh.me>
92cd2c04 · Clément Bœsch · 3eed90b1 · 263efc09 · 92cd2c04
Commit 92cd2c04 authored Mar 19, 2017 by Clément Bœsch
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

jfdctint_template.c libavcodec/jfdctint_template.c +0 -5

No files found.
--- 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


 /*