diff options
| author | James Almer <jamrial@gmail.com> | 2019-07-20 21:47:55 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-07-23 00:46:21 -0300 |
| commit | 1def4baa598450556ecbd74aeadc7788b1230739 (patch) | |
| tree | efaadc72f05c7b5230b22858dcb62c5db9ab8d19 | |
| parent | 47bb804f781370da35a443c5acda912bebb41984 (diff) | |
| download | ffmpeg-1def4baa598450556ecbd74aeadc7788b1230739.tar.gz | |
avformat/aacdec: resync to the next adts frame on invalid data instead of aborting
Should fix ticket #6634
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 881e1f5a6227a6fbaf67083d4d4b6caf58ff9892)
| -rw-r--r-- | libavformat/aacdec.c | 6 |
1 files 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; |