Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'

[ffmpeg] / libavcodec / simple_idct_template.c

diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c
index ffd75780a8594dcb384b4126f9670ea820efb421..64a7be02c54d704cdae03d1814a0cb2b0582d07c 100644 (file)
--- a/libavcodec/simple_idct_template.c
+++ b/libavcodec/simple_idct_template.c
@@ -64,6 +64,7 @@
 
 #elif BIT_DEPTH == 10 || BIT_DEPTH == 12
 
+#if BIT_DEPTH == 10
 #define W1 90901
 #define W2 85627
 #define W3 77062
@@ -72,13 +73,20 @@
 #define W6 35468
 #define W7 18081
 
-#if BIT_DEPTH == 10
 #define ROW_SHIFT 15
 #define COL_SHIFT 20
 #define DC_SHIFT 1
 #else
-#define ROW_SHIFT 17
-#define COL_SHIFT 18
+#define W1 45451
+#define W2 42813
+#define W3 38531
+#define W4 32767
+#define W5 25746
+#define W6 17734
+#define W7 9041
+
+#define ROW_SHIFT 16
+#define COL_SHIFT 17
 #define DC_SHIFT -1
 #endif