diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 11:22:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 11:59:20 +0100 |
| commit | e13d5e9a4b5b4de065b00b1caea850cd47fd4b18 (patch) | |
| tree | 13bf2f01763823c4e4da6374acadc95b3f8bc121 /doc/muxers.texi | |
| parent | 26afdbcfc0ecd646c6d829b781e0a53d6b289186 (diff) | |
| parent | 5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2 (diff) | |
| download | ffmpeg-e13d5e9a4b5b4de065b00b1caea850cd47fd4b18.tar.gz | |
Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2'
* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
x86: h264_weight_10bit: port to cpuflags
libtheoraenc: add missing pixdesc.h header
avcodec: remove ff_is_hwaccel_pix_fmt
pixdesc: add av_pix_fmt_get_chroma_sub_sample
hlsenc: stand alone hls segmenter
Conflicts:
doc/muxers.texi
libavcodec/ffv1enc.c
libavcodec/imgconvert.c
libavcodec/mpegvideo_enc.c
libavcodec/tiffenc.c
libavformat/Makefile
libavformat/allformats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/muxers.texi')
| -rw-r--r-- | doc/muxers.texi | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 34eed0fd20..1c8f93bdb0 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -129,6 +129,27 @@ ffmpeg -i INPUT -f framemd5 - See also the @ref{md5} muxer. +@anchor{hls} +@section hls + +Apple HTTP Live Streaming muxer that segments MPEG-TS according to +the HTTP Live Streaming specification. + +It creates a playlist file and numbered segment files. The output +filename specifies the playlist filename; the segment filenames +receive the same basename as the playlist, a sequential number and +a .ts extension. + +@example +ffmpeg -i in.nut out.m3u8 +@end example + +@table @option +@item -hls_time segment length in seconds +@item -hls_list_size maximum number of playlist entries +@item -hls_wrap number after which index wraps +@end table + @anchor{ico} @section ico |