diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-11 01:03:51 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-13 23:15:07 -0300 |
| commit | 7f79879a01898b94d5d2e8788752beae5e20e154 (patch) | |
| tree | 56997412a2c63f168ae8b47c660c5a0ba89edf38 | |
| parent | 6a9017d3a58669eaee79232365f27f10021a026d (diff) | |
| download | ffmpeg-7f79879a01898b94d5d2e8788752beae5e20e154.tar.gz | |
avcodec/aac_adtstoasc: fix ASC passthrough on small frames
ASC frames smaller than AAC_ADTS_HEADER_SIZE were being discarded.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 0f05f2c7e67949ce77de3cf7013f7d4da1c3e046)
| -rw-r--r-- | libavcodec/aac_adtstoasc_bsf.c | 6 |
1 files 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; |