ffmpeg | branch: master | Gyan Doshi <ffm...@gyani.pro> | Thu Mar 28 23:17:30 2019 +0530| [8eca42e6320ebfc682a1309bb40d019b41a9dfd5] | committer: Gyan Doshi
lavf/mov: skip extradata check in esds for MPEG-1/2 audio As per 14496-3 9.D.2.2, it's not defined for these audio object types. Fixes #7817. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8eca42e6320ebfc682a1309bb40d019b41a9dfd5 --- libavformat/isom.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/isom.c b/libavformat/isom.c index 0a4d901be5..4358dc4a6a 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -534,6 +534,10 @@ FF_ENABLE_DEPRECATION_WARNINGS len = ff_mp4_read_descr(fc, pb, &tag); if (tag == MP4DecSpecificDescrTag) { av_log(fc, AV_LOG_TRACE, "Specific MPEG-4 header len=%d\n", len); + /* As per 14496-3:2009 9.D.2.2, No decSpecificInfo is defined + for MPEG-1 Audio or MPEG-2 Audio; MPEG-2 AAC excluded. */ + if (object_type_id == 0x69 || object_type_id == 0x6b) + return 0; if (!len || (uint64_t)len > (1<<30)) return AVERROR_INVALIDDATA; if ((ret = ff_get_extradata(fc, st->codecpar, pb, len)) < 0) _______________________________________________ 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".
