ffmpeg | branch: master | Steven Liu <lingjiujia...@gmail.com> | Mon Jul 18 20:10:25 2016 +0800| [41ad6d193adee37bc2e805d8a03e94ddc883fb08] | committer: Michael Niedermayer
doc/muxers: improve hlsenc description Signed-off-by: Moritz Barsnick <barsn...@gmx.net> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41ad6d193adee37bc2e805d8a03e94ddc883fb08 --- doc/muxers.texi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 66539c1..5873269 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -396,8 +396,8 @@ which can be cyclic, for example if the @option{wrap} option is specified. @item hls_segment_filename @var{filename} -Set the segment filename. Unless hls_flags single_file is set @var{filename} -is used as a string format with the segment number: +Set the segment filename. Unless @code{hls_flags single_file} is set, +@var{filename} is used as a string format with the segment number: @example ffmpeg in.nut -hls_segment_filename 'file%03d.ts' out.m3u8 @end example @@ -507,10 +507,10 @@ first segment's information. Do not append the @code{EXT-X-ENDLIST} tag at the end of the playlist. @item hls_flags split_by_time -If this flags is set, allow segments to start on frames other than keyframes. -This improves behavior on some players when the time between keyframes is -inconsistent, but may make things worse on others, and can cause some oddities -during seeking. This flag should be used with hls_time option. +Allow segments to start on frames other than keyframes. This improves +behavior on some players when the time between keyframes is inconsistent, +but may make things worse on others, and can cause some oddities during +seeking. This flag should be used with the @code{hls_time} option. @item hls_playlist_type event Emit @code{#EXT-X-PLAYLIST-TYPE:EVENT} in the m3u8 header. Forces _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
