diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 23:38:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 23:42:58 +0200 |
| commit | 0b95f01140d0debe5ff6bf54d7490ade7c00421b (patch) | |
| tree | 06f3fc1f4b251778e1a54fff39ae7e049c2e7e79 | |
| parent | 95126728a5bda8ee68444f0873ac76be8f11abf1 (diff) | |
| parent | 8f24c12be7a3b3ea105e67bba9a867fe210a2333 (diff) | |
| download | ffmpeg-0b95f01140d0debe5ff6bf54d7490ade7c00421b.tar.gz | |
Merge commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333'
* commit '8f24c12be7a3b3ea105e67bba9a867fe210a2333':
ac3dec: Don't consume more data than the actual input packet size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index bfc81db26f..4d38ca1e22 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1308,7 +1308,7 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, av_log(avctx, AV_LOG_ERROR, "unsupported frame type : " "skipping frame\n"); *got_frame_ptr = 0; - return s->frame_size; + return buf_size; } else { av_log(avctx, AV_LOG_ERROR, "invalid frame type\n"); } |