diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2016-02-22 18:34:01 -0600 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-04-27 04:40:11 +0200 |
| commit | 7aaab36874293e6b06a07fa53306a01c42e665bc (patch) | |
| tree | fafbfbb6433be67a40cb23cf41879b32d21eee82 | |
| parent | 36e5854801a8c81c09aa3600db861794090b4fd8 (diff) | |
| download | ffmpeg-7aaab36874293e6b06a07fa53306a01c42e665bc.tar.gz | |
lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216
(cherry picked from commit 22dbc1caaf13e4bb17c9e0164a5b1ccaf490e428)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mov.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 10572791f4..3351ae2679 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3579,7 +3579,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); if (version > 1) { avpriv_request_sample(c->fc, "sidx version %u", version); - return AVERROR_PATCHWELCOME; + return 0; } avio_rb24(pb); // flags @@ -3592,8 +3592,8 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom) } } 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; |