aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2019-07-20 21:47:55 -0300
committerJames Almer <jamrial@gmail.com>2019-07-20 21:47:55 -0300
commit881e1f5a6227a6fbaf67083d4d4b6caf58ff9892 (patch)
treefaf717e3e8c05228cd69f2353b7e3313bdc11d08
parenta38eab8b7501440f872ff1af8a0c5482b7b3e532 (diff)
downloadffmpeg-881e1f5a6227a6fbaf67083d4d4b6caf58ff9892.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>
-rw-r--r--libavformat/aacdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 262614fdd9..00ca2319ca 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;