ffmpeg | branch: release/0.10 | Michael Niedermayer <michae...@gmx.at> | Thu Aug 7 02:27:07 2014 +0200| [a2c6cb260fdab9337e9a2aca2c53e5bf136dc3e1] | committer: Michael Niedermayer
avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet" Add padding, clear size, use the correct pointer. Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 4213fc5b9eebec53c7d22b770c3f1ceecca1c113) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2c6cb260fdab9337e9a2aca2c53e5bf136dc3e1 --- libavcodec/svq1dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 224aef5..1c00c93 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -652,7 +652,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - av_fast_malloc(s->pkt_swapped, &s->pkt_swapped_allocated, + av_fast_padded_malloc(&s->pkt_swapped, &s->pkt_swapped_allocated, buf_size); if (!s->pkt_swapped) return AVERROR(ENOMEM); @@ -821,6 +821,7 @@ static av_cold int svq1_decode_end(AVCodecContext *avctx) MpegEncContext *s = avctx->priv_data; av_freep(&s->pkt_swapped); + s->pkt_swapped_allocated = 0; MPV_common_end(s); return 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
