diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-06 11:40:30 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2015-01-12 23:16:05 +0100 |
commit | 1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4 (patch) | |
tree | ada84062b65cfe9215b5bd1daea4a687485a20f9 | |
parent | 20f9cf744a9a82ac4b269cb4317a5d59a8553baf (diff) | |
download | ffmpeg-1fd55ec507f6f47b4d9fddf8e79a0df4540ef6e4.tar.gz |
svq1dec: Unbreak the scratch buffer allocation
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>
-rw-r--r-- | libavcodec/svq1dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 14ff41cc18..789a0132fb 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -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); |