ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Aug 16 10:36:47 2024 -0300| [80606442377a7bca9501e2612e9a44b5044316ca] | committer: James Almer
avcodec/shorten: Fix discard of ‘const’ qualifier Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80606442377a7bca9501e2612e9a44b5044316ca --- libavcodec/shorten.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 12a179156a..46d3b7a615 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -563,7 +563,6 @@ static int shorten_decode_frame(AVCodecContext *avctx, AVFrame *frame, buf = &s->bitstream[s->bitstream_index]; buf_size += s->bitstream_size; s->bitstream_size = buf_size; - memset(buf + buf_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); /* do not decode until buffer has at least max_framesize bytes or * the end of the file has been reached */ @@ -583,10 +582,9 @@ static int shorten_decode_frame(AVCodecContext *avctx, AVFrame *frame, return ret; if (avpkt->size) { - int max_framesize; + int max_framesize = s->blocksize * s->channels * 8; void *tmp_ptr; - max_framesize = FFMAX(s->max_framesize, s->blocksize * s->channels * 8); tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, max_framesize + AV_INPUT_BUFFER_PADDING_SIZE); if (!tmp_ptr) { @@ -594,7 +592,10 @@ static int shorten_decode_frame(AVCodecContext *avctx, AVFrame *frame, return AVERROR(ENOMEM); } s->bitstream = tmp_ptr; - s->max_framesize = max_framesize; + if (max_framesize > s->max_framesize) + memset(s->bitstream + s->max_framesize, 0, (max_framesize - s->max_framesize) + + AV_INPUT_BUFFER_PADDING_SIZE); + s->max_framesize = FFMAX(s->max_framesize, max_framesize); *got_frame_ptr = 0; goto finish_frame; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
