virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavf/mov: skip extradata check in esds for MPEG-1/2 audio

Browse Source 
As per 14496-3 9.D.2.2, it's not defined for these audio object types.

Fixes #7817.
This commit is contained in:
Gyan Doshi 2019-03-28 22:59:30 +05:30
parent b43b8d337d
commit 8eca42e632
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/isom.c
View File

@ -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)