[FFmpeg-cvslog] Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
Michael Niedermayer
git at videolan.org
Tue Apr 29 16:26:24 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 29 15:42:04 2014 +0200| [fd601ba6b1c6a646aeb19839759644126316371e] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd601ba6b1c6a646aeb19839759644126316371e
---
More information about the ffmpeg-cvslog
mailing list