diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 15:42:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 15:57:43 +0200 |
| commit | fd601ba6b1c6a646aeb19839759644126316371e (patch) | |
| tree | 356219cfb107d2dc9dc117d76192d25d4bf0de0c /doc/muxers.texi | |
| parent | 6a0b5e34763c14a1e35e767f374ffb98fa64732f (diff) | |
| parent | 5c08ae4f37281441188447cd04dcaf7cd7ce031f (diff) | |
| download | ffmpeg-fd601ba6b1c6a646aeb19839759644126316371e.tar.gz | |
Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
* commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f':
segment: Add an option to prepend a string to the list entries
Conflicts:
doc/muxers.texi
libavformat/segment.c
See: 5e278c19c752d65fdc1da1ceb599b091f71a4b4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/muxers.texi')
| -rw-r--r-- | doc/muxers.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 30559d7d67..6362ed21a5 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -789,8 +789,8 @@ segments. If 0 the list file will contain all the segments. Default value is 0. @item segment_list_entry_prefix @var{prefix} -Set @var{prefix} to prepend to the name of each entry filename. By -default no prefix is applied. +Prepend @var{prefix} to each entry. Useful to generate absolute paths. +By default no prefix is applied. @item segment_list_type @var{type} Specify the format for the segment list file. |