summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-10-25 11:19:23 +0000
committerMichael Niedermayer <michaelni@gmx.at>2014-10-26 18:51:52 +0100
commit6fe02d25ee6816e44de8d8b23b6905d307e1ed28 (patch)
tree6e0d20b343bf4390ad0b38ec0428275ddcc55e99
parent2060f4cbba62d80d331624486e3ac106264699f8 (diff)
downloadffmpeg-6fe02d25ee6816e44de8d8b23b6905d307e1ed28.tar.gz
dv: fix weight table for 2x4x8 transform
The coefficients must be in the appropriate zigzag scan order. Also fix their values at the same time, as they were pretty wrong. Fixes ticket #2970. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dvdata.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index d7bee71f04..5f0a239a8c 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -80,14 +80,14 @@ const uint16_t ff_dv_iweight_88[64] = {
25172, 25972, 26722, 27969, 26722, 29692, 29692, 31521,
};
const uint16_t ff_dv_iweight_248[64] = {
- 32768, 17735, 16710, 18079, 18725, 21400, 17735, 19196,
- 19108, 21845, 16384, 17735, 18725, 21400, 16710, 18079,
- 20262, 23173, 18197, 19692, 18725, 20262, 20815, 23764,
- 17735, 19196, 19108, 21845, 20262, 23173, 18197, 19692,
- 21400, 24457, 19284, 20867, 21400, 23173, 22017, 25191,
- 18725, 20262, 20815, 23764, 21400, 24457, 19284, 20867,
- 24457, 27962, 22733, 24600, 25971, 29642, 21400, 23173,
- 22017, 25191, 24457, 27962, 22733, 24600, 25971, 29642,
+ 32768, 16384, 16705, 16705, 17734, 17734, 17734, 17734,
+ 18081, 18081, 18725, 18725, 21407, 21407, 19091, 19091,
+ 19195, 19195, 18205, 18205, 18725, 18725, 19705, 19705,
+ 20267, 20267, 21826, 21826, 23170, 23170, 20806, 20806,
+ 20267, 20267, 19266, 19266, 21407, 21407, 20853, 20853,
+ 21400, 21400, 23786, 23786, 24465, 24465, 22018, 22018,
+ 23170, 23170, 22725, 22725, 24598, 24598, 24465, 24465,
+ 25172, 25172, 27969, 27969, 25972, 25972, 29692, 29692
};
/**