aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-10 22:50:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-10 22:50:32 +0200
commit7e99ccf5d8c25d7fe670d9402349b055c0c1449a (patch)
treee598caa5d40c60e3fa32d6316475ed06df819777 /CREDITS
parent16f1e832badd85d7f1a0b37ab841af1d31006c9a (diff)
parent40c885c589808455a1c4b473509f1e6cd4908f55 (diff)
downloadffmpeg-7e99ccf5d8c25d7fe670d9402349b055c0c1449a.tar.gz
Merge commit '40c885c589808455a1c4b473509f1e6cd4908f55'
* commit '40c885c589808455a1c4b473509f1e6cd4908f55': vf_pad: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_pad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions