aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-08 13:47:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-08 13:48:19 +0200
commit53c3abc1083d630cb50427e09783cf6ce84d4a45 (patch)
tree7694c9a9730e0c3a25ec33204637e59c6e325bd2 /cmdutils.c
parent6333c6c17d1f43df0a5f07fdcaee40122fddcd60 (diff)
parent3ecbd911ff9177097820e5d00401c9bf29e5d167 (diff)
downloadffmpeg-53c3abc1083d630cb50427e09783cf6ce84d4a45.tar.gz
Merge commit '3ecbd911ff9177097820e5d00401c9bf29e5d167' into release/1.1
* commit '3ecbd911ff9177097820e5d00401c9bf29e5d167': Update Changelog for v9.14 Prepare for 9.14 Release Conflicts: Changelog RELEASE Not merged as this doesnt apply 1:1 to our releases Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions