diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 05:28:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:18:46 +0200 |
| commit | f7f5370b4b413c05f6ed848bffb85d28c5f44b9c (patch) | |
| tree | ed2fe1b571366103cc9e2450884194ffc4ffd7de /libavformat | |
| parent | e97e0eff84cbe1698c033823098ed7dc1c520157 (diff) | |
| download | ffmpeg-f7f5370b4b413c05f6ed848bffb85d28c5f44b9c.tar.gz | |
mov: add option to ignore edit lists.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/isom.h | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index 06bfbd0776..370ba43a25 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -161,6 +161,7 @@ typedef struct MOVContext { int itunes_metadata; ///< metadata are itunes style int chapter_track; int use_absolute_path; + int ignore_editlist; int64_t next_root_atom; ///< offset of the next root atom } MOVContext; diff --git a/libavformat/mov.c b/libavformat/mov.c index 3bf6dcc971..0639ddb5f3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2626,7 +2626,7 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom) int i, edit_count, version, edit_start_index = 0; int unsupported = 0; - if (c->fc->nb_streams < 1) + if (c->fc->nb_streams < 1 || c->ignore_editlist) return 0; sc = c->fc->streams[c->fc->nb_streams-1]->priv_data; @@ -3337,6 +3337,8 @@ static const AVOption options[] = { "allow using absolute path when opening alias, this is a possible security issue", offsetof(MOVContext, use_absolute_path), FF_OPT_TYPE_INT, {.dbl = 0}, 0, 1, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM}, + {"ignore_editlist", "", offsetof(MOVContext, ignore_editlist), FF_OPT_TYPE_INT, {.dbl = 0}, + 0, 1, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM}, {NULL} }; |