Michael Niedermayer fd601ba6b1 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>
2014-04-29 15:57:43 +02:00
..
2014-04-22 20:44:31 +02:00
2014-04-11 17:51:33 +02:00
2013-01-06 16:30:02 +01:00
2014-04-19 02:18:45 +02:00
2012-12-21 00:18:34 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00