Browse Source

lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216

(cherry picked from commit 22dbc1caaf)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n2.8.7
Rodger Combs Michael Niedermayer 10 years ago
parent
commit
7aaab36874
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavformat/mov.c

+ 3
- 3
libavformat/mov.c View File

@@ -3579,7 +3579,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom)
version = avio_r8(pb); version = avio_r8(pb);
if (version > 1) { if (version > 1) {
avpriv_request_sample(c->fc, "sidx version %u", version); avpriv_request_sample(c->fc, "sidx version %u", version);
return AVERROR_PATCHWELCOME;
return 0;
} }


avio_rb24(pb); // flags avio_rb24(pb); // flags
@@ -3592,8 +3592,8 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
} }
if (!st) { if (!st) {
av_log(c->fc, AV_LOG_ERROR, "could not find corresponding track id %d\n", track_id);
return AVERROR_INVALIDDATA;
av_log(c->fc, AV_LOG_WARNING, "could not find corresponding track id %d\n", track_id);
return 0;
} }


sc = st->priv_data; sc = st->priv_data;


Loading…
Cancel
Save