diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 19:41:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 20:32:06 +0200 |
| commit | ae215e2b42dd172f6bfd9f2dad44c9d5c11884bf (patch) | |
| tree | 14ac07afbbba24d9d557d0e3893bdf3699c31619 /libavcodec | |
| parent | 3bcf61f495dcadbc9679a00e6b1023531288498d (diff) | |
| parent | 6ec688e1bc76dd93151cbca1c340162ae4b10d77 (diff) | |
| download | ffmpeg-ae215e2b42dd172f6bfd9f2dad44c9d5c11884bf.tar.gz | |
Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'
* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
mp3: enable packed main_data decoding in MP4
Conflicts:
libavcodec/mpegaudiodec_template.c
Only the parts needed to support the available sample are merged
the remaining error checks are left in place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 1cc5ac47f4..9081a3ca94 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1686,7 +1686,7 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame_ptr, if (!avctx->bit_rate) avctx->bit_rate = s->bit_rate; - if (s->frame_size <= 0 || s->frame_size > buf_size) { + if (s->frame_size <= 0) { av_log(avctx, AV_LOG_ERROR, "incomplete frame\n"); return AVERROR_INVALIDDATA; } else if (s->frame_size < buf_size) { |