summaryrefslogtreecommitdiff
path: root/doc/demuxers.texi
diff options
context:
space:
mode:
Diffstat (limited to 'doc/demuxers.texi')
-rw-r--r--doc/demuxers.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 3c15ab9eee..13fe17ff4f 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -243,11 +243,12 @@ which streams to actually receive.
Each stream mirrors the @code{id} and @code{bandwidth} properties from the
@code{<Representation>} as metadata keys named "id" and "variant_bitrate" respectively.
-@section flv, live_flv
+@section flv, live_flv, kux
Adobe Flash Video Format demuxer.
This demuxer is used to demux FLV files and RTMP network streams. In case of live network streams, if you force format, you may use live_flv option instead of flv to survive timestamp discontinuities.
+KUX is a flv variant used on the Youku platform.
@example
ffmpeg -f flv -i myfile.flv ...