[FFmpeg-cvslog] Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 15:50:17 2017 +0100| [92cd2c04b1c255a40cfb27732aad4bc78211cd93] | committer: Clément Bœsch

Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'

* commit '263efc095e6c7ec2902119118b084cea29ea8916':
  jfdct: Kill broken cruft

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92cd2c04b1c255a40cfb27732aad4bc78211cd93
---

 libavcodec/jfdctint_template.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c
index 3ea2f5d..67fb77b 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
 
 
 /*


======================================================================