[FFmpeg-cvslog] takdec: fix initialisation of LOCAL_ALIGNED array

Josh Allmann git at videolan.org
Sat Dec 8 16:40:07 CET 2012


ffmpeg | branch: master | Josh Allmann <joshua.allmann at gmail.com> | Sat Dec  8 00:00:30 2012 +0100| [b3deec325310938ec0a38a8ed1a795c451f2ea73] | committer: Janne Grunau

takdec: fix initialisation of LOCAL_ALIGNED array

When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.

Signed-off-by: Janne Grunau <janne-libav at jannau.net>

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

 libavcodec/takdec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 0ac870c..d47db48 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -601,10 +601,12 @@ static int decorrelate(TAKDecContext *s, int c1, int c2, int length)
     case 6:
         FFSWAP(int32_t*, p1, p2);
     case 7: {
-        LOCAL_ALIGNED_16(int16_t, filter, [MAX_PREDICTORS]) = { 0 };
+        LOCAL_ALIGNED_16(int16_t, filter, [MAX_PREDICTORS]);
         int length2, order_half, filter_order, dval1, dval2;
         int av_uninit(code_size);
 
+        memset(filter, 0, MAX_PREDICTORS * sizeof(*filter));
+
         if (length < 256)
             return AVERROR_INVALIDDATA;
 



More information about the ffmpeg-cvslog mailing list