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

mov: Add an option to toggle dref opening

Browse Source 
This feature is mostly only used by NLE software, and is
both of dubious value being enabled by default, and a
possible security risk.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 712d962a6a)

Conflicts:

	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

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

Conflicts:

	libavformat/mov.c
This commit is contained in:
Derek Buitenhuis
2016-01-15 17:03:49 +00:00
committed by Michael Niedermayer
parent 9f30eafd0f
commit dd957b56e6
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@@ -190,6 +190,7 @@ typedef struct MOVContext {
MOVFragmentIndex** fragment_index_data; MOVFragmentIndex** fragment_index_data;
unsigned fragment_index_count; unsigned fragment_index_count;
int atom_depth; int atom_depth;
int enable_drefs;
} MOVContext; } MOVContext;
int ff_mp4_read_descr_len(AVIOContext *pb); int ff_mp4_read_descr_len(AVIOContext *pb);

22
libavformat/mov.c
View File

@@ -2559,13 +2559,23 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) { if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) {
MOVDref *dref = &sc->drefs[sc->dref_id - 1]; MOVDref *dref = &sc->drefs[sc->dref_id - 1];
if (mov_open_dref(&sc->pb, c->fc->filename, dref, &c->fc->interrupt_callback, if (c->enable_drefs) {
c->use_absolute_path, c->fc) < 0) if (mov_open_dref(&sc->pb, c->fc->filename, dref, &c->fc->interrupt_callback,
av_log(c->fc, AV_LOG_ERROR, c->use_absolute_path, c->fc) < 0)
"stream %d, error opening alias: path='%s', dir='%s', " av_log(c->fc, AV_LOG_ERROR,
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n", "stream %d, error opening alias: path='%s', dir='%s', "
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n",
st->index, dref->path, dref->dir, dref->filename,
dref->volume, dref->nlvl_from, dref->nlvl_to);
} else {
av_log(c->fc, AV_LOG_WARNING,
"Skipped opening external track: "
"stream %d, alias: path='%s', dir='%s', "
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d."
"Set enable_drefs to allow this.\n",
st->index, dref->path, dref->dir, dref->filename, st->index, dref->path, dref->dir, dref->filename,
dref->volume, dref->nlvl_from, dref->nlvl_to); dref->volume, dref->nlvl_from, dref->nlvl_to);
}
} else { } else {
sc->pb = c->fc->pb; sc->pb = c->fc->pb;
sc->pb_is_copied = 1; sc->pb_is_copied = 1;
@@ -4250,6 +4260,8 @@ static const AVOption mov_options[] = {
AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM, "use_mfra_for" }, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_DECODING_PARAM, "use_mfra_for" },
{ "export_all", "Export unrecognized metadata entries", OFFSET(export_all), { "export_all", "Export unrecognized metadata entries", OFFSET(export_all),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = FLAGS }, AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = FLAGS },
{ "enable_drefs", "Enable external track support.", OFFSET(enable_drefs), AV_OPT_TYPE_INT,
{.i64 = 0}, 0, 1, FLAGS },
{ NULL }, { NULL },
}; };