aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_decimate.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-04 20:20:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-04 20:34:40 +0200
commit69a68d301345a89a27479f2a6093fc4624804049 (patch)
tree274c0bfe1285021e811bc79accaa307731f5314a /libavfilter/vf_decimate.c
parentddc6adaa280aecd973cc3cc1661f8bafe28738c8 (diff)
parent12f0388f9cb32016ac0dacaeca631b088b29bb96 (diff)
downloadffmpeg-69a68d301345a89a27479f2a6093fc4624804049.tar.gz
Merge commit '12f0388f9cb32016ac0dacaeca631b088b29bb96'
* commit '12f0388f9cb32016ac0dacaeca631b088b29bb96': Add release notes for 11. Conflicts: doc/RELEASE_NOTES Mostly not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_decimate.c')
0 files changed, 0 insertions, 0 deletions