aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/libmodplug.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-24 13:04:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-24 13:14:33 +0200
commit6ef5e292200b6824b666a6a876d344fe7e6a48b2 (patch)
tree79c7ba1c956938f574846474fb4568ce694a10e8 /libavformat/libmodplug.c
parent7ad34f445648b8f0e8e15d67ccd61ca4c9192cdf (diff)
parent88b32673db39440422a73ec3047d3326c96b4fb2 (diff)
downloadffmpeg-6ef5e292200b6824b666a6a876d344fe7e6a48b2.tar.gz
Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'
* commit '88b32673db39440422a73ec3047d3326c96b4fb2': avconv: copy stream-level side data when streamcopying Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/libmodplug.c')
0 files changed, 0 insertions, 0 deletions