aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_fade.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-02 21:16:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-02 21:16:15 +0100
commit8f79cd4764f7cdf3c5b5252e39ee0a6725f2eb94 (patch)
tree15684e295f8d5c233a696e0780b877f02c95309c /libavfilter/vf_fade.c
parent7b32b35bf5c4b02a959477392dfe8963a33a6436 (diff)
parent11e05533170485b593974cf90916425a0188e7bd (diff)
downloadffmpeg-8f79cd4764f7cdf3c5b5252e39ee0a6725f2eb94.tar.gz
Merge commit '11e05533170485b593974cf90916425a0188e7bd'
* commit '11e05533170485b593974cf90916425a0188e7bd': Ignore generated file tools/sidxindex. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_fade.c')
0 files changed, 0 insertions, 0 deletions