[FFmpeg-cvslog] avcodec/atrac3plusdec: consume only as many bytes as available

Michael Niedermayer git at videolan.org
Thu Jun 4 23:12:21 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun  4 22:47:24 2015 +0200| [6b6ae7c3ead5dee786a4aea929820076a7c82da4] | committer: Michael Niedermayer

avcodec/atrac3plusdec: consume only as many bytes as available

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b6ae7c3ead5dee786a4aea929820076a7c82da4
---

 libavcodec/atrac3plusdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c
index f858497..b4437f1 100644
--- a/libavcodec/atrac3plusdec.c
+++ b/libavcodec/atrac3plusdec.c
@@ -384,7 +384,7 @@ static int atrac3p_decode_frame(AVCodecContext *avctx, void *data,
 
     *got_frame_ptr = 1;
 
-    return avctx->block_align;
+    return FFMIN(avctx->block_align, avpkt->size);
 }
 
 AVCodec ff_atrac3p_decoder = {



More information about the ffmpeg-cvslog mailing list