generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mov: add option to ignore edit lists.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-02 05:28:27 +02:00
parent e97e0eff84
commit f7f5370b4b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@ -161,6 +161,7 @@ typedef struct MOVContext {
int itunes_metadata; ///< metadata are itunes style int itunes_metadata; ///< metadata are itunes style
int chapter_track; int chapter_track;
int use_absolute_path; int use_absolute_path;
int ignore_editlist;
int64_t next_root_atom; ///< offset of the next root atom int64_t next_root_atom; ///< offset of the next root atom
} MOVContext; } MOVContext;

4
libavformat/mov.c
View File

@ -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 i, edit_count, version, edit_start_index = 0;
int unsupported = 0; int unsupported = 0;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1 || c->ignore_editlist)
return 0; return 0;
sc = c->fc->streams[c->fc->nb_streams-1]->priv_data; 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", "allow using absolute path when opening alias, this is a possible security issue",
offsetof(MOVContext, use_absolute_path), FF_OPT_TYPE_INT, {.dbl = 0}, offsetof(MOVContext, use_absolute_path), FF_OPT_TYPE_INT, {.dbl = 0},
0, 1, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM}, 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} {NULL}
}; };