RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mov: ignore old infe box versions 

Some files with no image items have them, and were working prior to the recent
HEIF parsing overhaul.
Ignore such boxes instead, to recover the old behavior.

Fixes a regression since d9fed9df2a.

Tested-by: Wu Jianhua <toqsxw@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-04-13 10:11:03 -03:00
parent 6927457443
commit 5b9db32ccc
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/mov.c
View File

@ -8137,8 +8137,8 @@ static int mov_read_infe(MOVContext *c, AVIOContext *pb, MOVAtom atom, int idx)
size -= 4; size -= 4;
if (version < 2) { if (version < 2) {
av_log(c->fc, AV_LOG_ERROR, "infe: version < 2 not supported\n"); avpriv_report_missing_feature(c->fc, "infe version < 2");
return AVERROR_PATCHWELCOME; return 1;
} }
item_id = version > 2 ? avio_rb32(pb) : avio_rb16(pb); item_id = version > 2 ? avio_rb32(pb) : avio_rb16(pb);
@ -8209,6 +8209,8 @@ static int mov_read_iinf(MOVContext *c, AVIOContext *pb, MOVAtom atom)
ret = mov_read_infe(c, pb, infe, i); ret = mov_read_infe(c, pb, infe, i);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret)
return 0;
} }
c->found_iinf = 1; c->found_iinf = 1;
@ -9508,14 +9510,15 @@ static int mov_read_header(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "error reading header\n"); av_log(s, AV_LOG_ERROR, "error reading header\n");
return err; return err;
} }
} while ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mov->found_moov && !mov->found_iloc && !mov->moov_retry++); } while ((pb->seekable & AVIO_SEEKABLE_NORMAL) &&
if (!mov->found_moov && !mov->found_iloc) { !mov->found_moov && (!mov->found_iloc || !mov->found_iinf) && !mov->moov_retry++);
if (!mov->found_moov && !mov->found_iloc && !mov->found_iinf) {
av_log(s, AV_LOG_ERROR, "moov atom not found\n"); av_log(s, AV_LOG_ERROR, "moov atom not found\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
av_log(mov->fc, AV_LOG_TRACE, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb)); av_log(mov->fc, AV_LOG_TRACE, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb));
if (mov->found_iloc) { if (mov->found_iloc && mov->found_iinf) {
for (i = 0; i < mov->nb_heif_item; i++) { for (i = 0; i < mov->nb_heif_item; i++) {
HEIFItem *item = &mov->heif_item[i]; HEIFItem *item = &mov->heif_item[i];
MOVStreamContext *sc; MOVStreamContext *sc;