diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 11:55:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 11:55:03 +0200 |
| commit | a13af77f49d79e8994d22e598e4ca82a2f5d09d4 (patch) | |
| tree | db01e85b3d33f743ff1e49c8c4bf62451500384a | |
| parent | 87d38ad803b81dd4a4afb6607b3863605403dc9c (diff) | |
| parent | 21015109ec0fac0f104a5355f272ecb956ba3f4e (diff) | |
| download | ffmpeg-a13af77f49d79e8994d22e598e4ca82a2f5d09d4.tar.gz | |
Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
doc: Document the flv demuxer
Conflicts:
doc/demuxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/demuxers.texi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 437d1cac0b..140f0b1fe6 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -103,6 +103,17 @@ probed and 0 otherwise. @end table +@section flv + +Adobe Flash Video Format demuxer. + +This demuxer is used to demux FLV files and RTMP network streams. + +@table @option +@item -flv_demuxer @var{bool} +Allocate the streams according to the onMetaData array content. +@end table + @section libgme The Game Music Emu library is a collection of video game music file emulators. |