Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'

[ffmpeg] / libavcodec / jfdctint_template.c

diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c
index 3ea2f5dadc4e059093f1a872f40cdf8a3dc03d43..67fb77b5e12010f1c34d5c599c9d7e8c234e20a7 100644 (file)
--- 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
 
 
 /*