[FFmpeg-cvslog] lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216
Rodger Combs
git at videolan.org
Wed Apr 27 05:42:55 CEST 2016
ffmpeg | branch: release/2.8 | Rodger Combs <rodger.combs at gmail.com> | Mon Feb 22 18:34:01 2016 -0600| [7aaab36874293e6b06a07fa53306a01c42e665bc] | 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=7aaab36874293e6b06a07fa53306a01c42e665bc
---
libavformat/mov.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1057279..3351ae2 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;
More information about the ffmpeg-cvslog
mailing list