ffmpeg | branch: release/2.6 | Michael Niedermayer <michae...@gmx.at> | Thu Jun 4 22:47:24 2015 +0200| [c2595b448571651c2cb5bbcd43238f6adb2d784c] | committer: Michael Niedermayer
avcodec/atrac3plusdec: consume only as many bytes as available Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit 6b6ae7c3ead5dee786a4aea929820076a7c82da4) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2595b448571651c2cb5bbcd43238f6adb2d784c --- libavcodec/atrac3plusdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c index e6f0416..e98036e 100644 --- a/libavcodec/atrac3plusdec.c +++ b/libavcodec/atrac3plusdec.c @@ -381,7 +381,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 = { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
