-
Michael Niedermayer authored
* commit '5c08ae4f': segment: Add an option to prepend a string to the list entries Conflicts: doc/muxers.texi libavformat/segment.c See: 5e278c19Merged-by: Michael Niedermayer <michaelni@gmx.at>
fd601ba6
* commit '5c08ae4f': segment: Add an option to prepend a string to the list entries Conflicts: doc/muxers.texi libavformat/segment.c See: 5e278c19Merged-by: Michael Niedermayer <michaelni@gmx.at>