diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 13:37:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 13:37:16 +0200 |
| commit | d68adbd666cbc1180380034324d86cb31f1f77ae (patch) | |
| tree | 15d9f11e9e9f3fb6ec6c9a15a5d9848e379364ed /doc | |
| parent | 221a99aae767961c7567dc222f74b778581c9458 (diff) | |
| parent | f8ef91ff3d6bb83d601d816ef9368f911021c64b (diff) | |
| download | ffmpeg-d68adbd666cbc1180380034324d86cb31f1f77ae.tar.gz | |
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
movenc: add faststart option for web streaming
Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/muxers.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 4fa9f11f50..73e4c54958 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -451,8 +451,8 @@ pair for each track, making it easier to separate tracks. This option is implicitly set when writing ismv (Smooth Streaming) files. @item -movflags faststart -Run a second pass moving the moov atom on top of the file. This -operation can take a while, and will not work in various situations such +Run a second pass moving the index (moov atom) to the beginning of the file. +This operation can take a while, and will not work in various situations such as fragmented output, thus it is not enabled by default. @item -movflags rtphint Add RTP hinting tracks to the output file. |