Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 13:42:04 +0000 (15:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 13:57:43 +0000 (15:57 +0200)
commitfd601ba6b1c6a646aeb19839759644126316371e
tree356219cfb107d2dc9dc117d76192d25d4bf0de0c
parent6a0b5e34763c14a1e35e767f374ffb98fa64732f
parent5c08ae4f37281441188447cd04dcaf7cd7ce031f
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>
doc/muxers.texi
libavformat/segment.c