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 <michaelni@gmx.at>
(cherry picked from commit 4213fc5b9eebec53c7d22b770c3f1ceecca1c113)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 02:27:07 +02:00
parent aed8f48545
commit a2c6cb260f

View File

@ -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;