aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-04 22:47:24 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 04:43:39 +0200
commitc2595b448571651c2cb5bbcd43238f6adb2d784c (patch)
tree63f5fb8ac7360f31bd013be5e7a9fd7c5e2dfa25
parentc8377cc49b2fe1d97836e1f8df4c3490b07612d1 (diff)
downloadffmpeg-c2595b448571651c2cb5bbcd43238f6adb2d784c.tar.gz
avcodec/atrac3plusdec: consume only as many bytes as available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6b6ae7c3ead5dee786a4aea929820076a7c82da4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/atrac3plusdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c
index e6f0416317..e98036e6db 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 = {