aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-29 15:42:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-29 15:57:43 +0200
commitfd601ba6b1c6a646aeb19839759644126316371e (patch)
tree356219cfb107d2dc9dc117d76192d25d4bf0de0c /.gitignore
parent6a0b5e34763c14a1e35e767f374ffb98fa64732f (diff)
parent5c08ae4f37281441188447cd04dcaf7cd7ce031f (diff)
downloadffmpeg-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 '.gitignore')
0 files changed, 0 insertions, 0 deletions