mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 08:12:44 +00:00
Merge commit '21015109ec0fac0f104a5355f272ecb956ba3f4e'
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e': doc: Document the flv demuxer Conflicts: doc/demuxers.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
a13af77f49
@ -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.
|
||||||
|
Loading…
Reference in New Issue
Block a user