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

Rodger Combs git at videolan.org
Sat Mar 26 22:36:04 CET 2016


ffmpeg | branch: release/3.0 | Rodger Combs <rodger.combs at gmail.com> | Mon Feb 22 18:34:01 2016 -0600| [3b179b630253466b325b44fd6355a4c8d3548b62] | committer: Michael Niedermayer

lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216
(cherry picked from commit 22dbc1caaf13e4bb17c9e0164a5b1ccaf490e428)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b179b630253466b325b44fd6355a4c8d3548b62
---

 libavformat/mov.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index c5e0a1e..0408ad1 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3666,7 +3666,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
@@ -3679,8 +3679,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;



More information about the ffmpeg-cvslog mailing list