diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 16:37:22 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 16:37:22 +0200 |
commit | 217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b (patch) | |
tree | 8f2a5b126f1c1a0ade4645e86ae9419b4a977f51 /doc | |
parent | fd601ba6b1c6a646aeb19839759644126316371e (diff) | |
parent | 5a70a783f04919514efec7751d710b64d8975fd7 (diff) | |
download | ffmpeg-streaming-217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b.zip ffmpeg-streaming-217f6c53e5c2d27dbe0d41eaea739c7cc6e5640b.tar.gz |
Merge commit '5a70a783f04919514efec7751d710b64d8975fd7'
* commit '5a70a783f04919514efec7751d710b64d8975fd7':
hls: Add an option to prepend a baseurl to the playlist entries
Conflicts:
doc/muxers.texi
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/muxers.texi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 6362ed2..1fcd38d 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -233,6 +233,10 @@ to @var{wrap}. Start the playlist sequence number from @var{number}. Default value is 0. +@item hls_base_url @var{baseurl} +Append @var{baseurl} to every entry in the playlist. +Useful to generate playlists with absolute paths. + Note that the playlist sequence number must be unique for each segment and it is not to be confused with the segment filename sequence number which can be cyclic, for example if the @option{wrap} option is |