Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 09:26:49 +0000 (10:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 09:26:49 +0000 (10:26 +0100)
commitfc5fe4804fd2ee9a29de502e9431b12d027c0c89
treed7f4d448e386af2964019cfc0eb5efa3698c21cf
parentffe33500983983946048def3a6047920d97d957b
parented1a11ed52bbd1f15bb9b0416d69b7924bee3191
Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'

* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
libavfilter/x86/vf_gradfun_init.c

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