[01/10] movenc: Remove an outdated comment

Message ID 1415365019-26521-1-git-send-email-martin@martin.st
State Committed
Commit 95a449d3ce8e15522df47a80a8a4593ea5c2b1bb
Headers show

Commit Message

Martin Storsjö Nov. 7, 2014, 12:56 p.m.
QuickTime does support files with an empty initial movie
these days.
---
 doc/muxers.texi      | 1 -
 libavformat/movenc.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Luca Barbato Nov. 7, 2014, 1:54 p.m. | #1
On 07/11/14 13:56, Martin Storsjö wrote:
> QuickTime does support files with an empty initial movie
> these days.
> ---
>   doc/muxers.texi      | 1 -
>   libavformat/movenc.c | 2 +-
>   2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/doc/muxers.texi b/doc/muxers.texi
> index 6d2c495..d71eb09 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 3b7f5ae..e2a6bbc 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" },
>

Ok.

Patch

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 6d2c495..d71eb09 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 3b7f5ae..e2a6bbc 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" },