diff options
| author | James Almer <jamrial@gmail.com> | 2019-07-20 21:47:55 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-07-21 01:06:29 -0300 |
| commit | a21a9c78637ac1d86dd272214b6fc2008aef4db1 (patch) | |
| tree | cd17380eb7f432b2b2c3c56f9ca901fa67df1fcb /libavformat/aacdec.c | |
| parent | 1fbe0286e4091dd4cdc0694965d92c42b98cacf1 (diff) | |
| download | ffmpeg-a21a9c78637ac1d86dd272214b6fc2008aef4db1.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)
Diffstat (limited to 'libavformat/aacdec.c')
| -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; |