ASC frames smaller than AAC_ADTS_HEADER_SIZE were being discarded.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/aac_adtstoasc_bsf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c
index 1067160559..e116b1d85b 100644
--- a/libavcodec/aac_adtstoasc_bsf.c
+++ b/libavcodec/aac_adtstoasc_bsf.c
@@ -49,14 +49,14 @@ static int aac_adtstoasc_filter(AVBSFContext *bsfc,
AVPacket *out)
if (ret < 0)
return ret;
+ if (bsfc->par_in->extradata && in->size >= 2 && (AV_RB16(in->data) >> 4)
!= 0xfff)
+ goto finish;
+
if (in->size < AAC_ADTS_HEADER_SIZE)
goto packet_too_small;
init_get_bits(&gb, in->data, AAC_ADTS_HEADER_SIZE * 8);
- if (bsfc->par_in->extradata && show_bits(&gb, 12) != 0xfff)
- goto finish;
-
if (avpriv_aac_parse_header(&gb, &hdr) < 0) {
av_log(bsfc, AV_LOG_ERROR, "Error parsing ADTS frame header!\n");
ret = AVERROR_INVALIDDATA;
--
2.12.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
