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 /libavdevice/dshow.c | |
| 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 'libavdevice/dshow.c')
0 files changed, 0 insertions, 0 deletions