ffmpeg | branch: release/4.0 | James Almer <jamr...@gmail.com> | Sat Jul 20 21:47:55 2019 -0300| [1def4baa598450556ecbd74aeadc7788b1230739] | committer: James Almer
avformat/aacdec: resync to the next adts frame on invalid data instead of aborting Should fix ticket #6634 Signed-off-by: James Almer <jamr...@gmail.com> (cherry picked from commit 881e1f5a6227a6fbaf67083d4d4b6caf58ff9892) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1def4baa598450556ecbd74aeadc7788b1230739 --- libavformat/aacdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 66fa49ac26..09fbab2766 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -190,9 +190,9 @@ retry: } if (!ff_id3v2_match(pkt->data, ID3v2_DEFAULT_MAGIC)) { av_packet_unref(pkt); - return AVERROR_INVALIDDATA; - } - ret = handle_id3(s, pkt); + ret = adts_aac_resync(s); + } else + ret = handle_id3(s, pkt); if (ret < 0) return ret; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
