virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'

Browse Source 
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e':
  doc: Document the flv demuxer

Conflicts:
	doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-28 11:55:03 +02:00
parent 87d38ad803 21015109ec
commit a13af77f49
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/demuxers.texi
View File

@@ -103,6 +103,17 @@ probed and 0 otherwise.
@end table @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 @section libgme
The Game Music Emu library is a collection of video game music file emulators. The Game Music Emu library is a collection of video game music file emulators.