From cc8538ff939e3b0d3fd5430e7f82439daf83f9f3 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Thu, 22 Apr 2010 21:43:36 +0000
Subject: [PATCH] ac3dec: return smaller of buf_size and frame_size instead of
always returning frame_size.
Originally committed as revision 22950 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/ac3dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 182e4fbcb04..0f9052ec26f 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1420,7 +1420,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
out_samples += 256 * s->out_channels;
}
*data_size = s->num_blocks * 256 * avctx->channels * sizeof (int16_t);
- return s->frame_size;
+ return FFMIN(buf_size, s->frame_size);
}
/**
--
GitLab