[FFmpeg-cvslog] wmalosslessdec: make mclms arrays big enough for whats written into them.

Michael Niedermayer git at videolan.org
Mon Mar 10 19:00:47 CET 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 14 14:49:22 2012 +0200| [ca8c3ec11b8ceb6d753176d5c04145cb83cbbe47] | committer: Michael Niedermayer

wmalosslessdec: make mclms arrays big enough for whats written into them.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a0abefb0af64a311b15141062c77dd577ba590a3)

Conflicts:

	libavcodec/wmalosslessdec.c

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

 libavcodec/wmalosslessdec.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index 3f23b66..d6e5a1e 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -240,9 +240,9 @@ typedef struct WmallDecodeCtx {
     int8_t mclms_scaling;
     int16_t mclms_coeffs[128];
     int16_t mclms_coeffs_cur[4];
-    int16_t mclms_prevvalues[64];   // FIXME: should be 32-bit / 16-bit depending on bit-depth
-    int16_t mclms_updates[64];
-    int mclms_recent;
+    int16_t mclms_prevvalues[WMALL_MAX_CHANNELS * 2 * 32];
+    int16_t mclms_updates[WMALL_MAX_CHANNELS * 2 * 32];
+    int     mclms_recent;
 
     int movave_scaling;
     int quant_stepsize;



More information about the ffmpeg-cvslog mailing list