aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Robitza <werner.robitza@gmail.com>2018-10-30 20:22:55 +0100
committerLou Logan <lou@lrcd.com>2018-10-30 14:08:19 -0800
commitad5ca1fb72fc1e0d7cdeec85b279608f8195c96e (patch)
treeb8cd28f3102c7db4c1e6c9debba0c467494ba676
parent32d021cfa6520c53da23a10732f9ae9cf28ea948 (diff)
downloadffmpeg-ad5ca1fb72fc1e0d7cdeec85b279608f8195c96e.tar.gz
doc/hls: fix grammar for HLS options
This fixes the grammar of two HLS option descriptions and makes them less ambiguous. Signed-off-by: Werner Robitza <werner.robitza@gmail.com> Signed-off-by: Lou Logan <lou@lrcd.com>
-rw-r--r--doc/muxers.texi10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi
index f18543e83d..62f4091e31 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -764,17 +764,17 @@ Possible values:
@table @samp
@item mpegts
-If this flag is set, the hls segment files will format to mpegts.
-the mpegts files is used in all hls versions.
+Output segment files in MPEG-2 Transport Stream format. This is
+compatible with all HLS versions.
@item fmp4
-If this flag is set, the hls segment files will format to fragment mp4 looks like dash.
-the fmp4 files is used in hls after version 7.
+Output segment files in fragmented MP4 format, similar to MPEG-DASH.
+fmp4 files may be used in HLS version 7 and above.
@end table
@item hls_fmp4_init_filename @var{filename}
-set filename to the fragment files header file, default filename is @file{init.mp4}.
+Set filename to the fragment files header file, default filename is @file{init.mp4}.
When @code{var_stream_map} is set with two or more variant streams, the
@var{filename} pattern must contain the string "%v", this string specifies