Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 10:13:38 +0000 (12:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 10:14:49 +0000 (12:14 +0200)
commitf4f8499c19734e1200a9a824734dbc36fba48ce6
tree905bd0fb8ebb36b04b75efb4033bdfefc1cb4cb0
parent76424b2da8506be50ea95e0b415f154054f0d2d1
parentf6633c55a3c0e93a5b2bab6aa0692fb608f2a38d
Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/gradfun.h
libavfilter/vf_gradfun.c
libavfilter/x86/vf_gradfun.c