OSDN Git Service

svq1dec: Unbreak the scratch buffer allocation
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Dec 2014 10:40:30 +0000 (11:40 +0100)
committerLuca Barbato <lu_zero@gentoo.org>
Sun, 14 Dec 2014 21:03:58 +0000 (22:03 +0100)
The input packets are always assumed to be padded and
the av_fast_ family of function takes a pointer to a pointer.

Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for
a similar patch.

Introduced in 7b588bb691644e1b3c168b99accf74248a24e3cf.

Bug-Id: 766
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/svq1dec.c

index 14ff41c..789a013 100644 (file)
@@ -637,8 +637,9 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data,
             return AVERROR_INVALIDDATA;
         }
 
-        av_fast_malloc(s->pkt_swapped, &s->pkt_swapped_allocated,
-                       buf_size);
+        av_fast_padded_malloc(&s->pkt_swapped,
+                              &s->pkt_swapped_allocated,
+                              buf_size);
         if (!s->pkt_swapped)
             return AVERROR(ENOMEM);