Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavformat/isom.h1
-rw-r--r--libavformat/mov.c7
2 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h
index dba30a25f1..a082e403b7 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -190,6 +190,7 @@ typedef struct MOVContext {
int chapter_track;
int use_absolute_path;
int ignore_editlist;
+ int ignore_chapters;
int seek_individually;
int64_t next_root_atom; ///< offset of the next root atom
int export_all;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index a7ba4d8ae2..38d36590e6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -462,6 +462,9 @@ static int mov_read_chpl(MOVContext *c, AVIOContext *pb, MOVAtom atom)
char str[256+1];
int ret;
+ if (c->ignore_chapters)
+ return 0;
+
if ((atom.size -= 5) < 0)
return 0;
@@ -4635,7 +4638,7 @@ static int mov_read_header(AVFormatContext *s)
av_log(mov->fc, AV_LOG_TRACE, "on_parse_exit_offset=%"PRId64"\n", avio_tell(pb));
if (pb->seekable) {
- if (mov->chapter_track > 0)
+ if (mov->chapter_track > 0 && !mov->ignore_chapters)
mov_read_chapters(s);
for (i = 0; i < s->nb_streams; i++)
if (s->streams[i]->codec->codec_tag == AV_RL32("tmcd"))
@@ -5046,6 +5049,8 @@ static const AVOption mov_options[] = {
0, 1, FLAGS},
{"ignore_editlist", "", OFFSET(ignore_editlist), AV_OPT_TYPE_INT, {.i64 = 0},
0, 1, FLAGS},
+ {"ignore_chapters", "", OFFSET(ignore_chapters), AV_OPT_TYPE_BOOL, {.i64 = 0},
+ 0, 1, FLAGS},
{"use_mfra_for",
"use mfra for fragment timestamps",
OFFSET(use_mfra_for), AV_OPT_TYPE_INT, {.i64 = FF_MOV_FLAG_MFRA_AUTO},