diff options
| author | Martin Storsjö <martin@martin.st> | 2014-11-03 15:27:42 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-11-08 11:13:37 +0200 |
| commit | 95a449d3ce8e15522df47a80a8a4593ea5c2b1bb (patch) | |
| tree | 8773162f53234e199a4a5335616e21e985200199 | |
| parent | 9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d (diff) | |
| download | ffmpeg-95a449d3ce8e15522df47a80a8a4593ea5c2b1bb.tar.gz | |
movenc: Remove an outdated comment
QuickTime does support files with an empty initial movie
these days.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | doc/muxers.texi | 1 | ||||
| -rw-r--r-- | libavformat/movenc.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 6d2c49562b..d71eb09a4f 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -319,7 +319,6 @@ a short portion of the file. With this option set, there is no initial mdat atom, and the moov atom only describes the tracks but has a zero duration. -Files written with this option set do not work in QuickTime. This option is implicitly set when writing ismv (Smooth Streaming) files. @item -movflags separate_moof Write a separate moof (movie fragment) atom for each track. Normally, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3b7f5aea55..e2a6bbc2fd 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -50,7 +50,7 @@ static const AVOption options[] = { { "movflags", "MOV muxer flags", offsetof(MOVMuxContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "rtphint", "Add RTP hint tracks", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_RTP_HINT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, - { "empty_moov", "Make the initial moov atom empty (not supported by QuickTime)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_EMPTY_MOOV}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, + { "empty_moov", "Make the initial moov atom empty", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_EMPTY_MOOV}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "frag_keyframe", "Fragment at video keyframes", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_KEYFRAME}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "separate_moof", "Write separate moof/mdat atoms for each track", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_SEPARATE_MOOF}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, { "frag_custom", "Flush fragments on caller requests", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_FRAG_CUSTOM}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" }, |