aboutsummaryrefslogtreecommitdiffstats
path: root/tools/dvd2concat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-04 20:50:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-04 20:50:01 +0200
commit53b089200557b299174bec72415b166ad43083a6 (patch)
treebfcb2f8ea991bdc2221e43c9e7488f8f991daaa4 /tools/dvd2concat
parent69a68d301345a89a27479f2a6093fc4624804049 (diff)
parentd9792b773516a560ecb99694b8ee745a50027fac (diff)
downloadffmpeg-53b089200557b299174bec72415b166ad43083a6.tar.gz
Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'
* commit 'd9792b773516a560ecb99694b8ee745a50027fac': Mark 11 release in the changelog Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/dvd2concat')
0 files changed, 0 insertions, 0 deletions