Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Oct 2013 08:32:17 +0000 (10:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Oct 2013 08:35:39 +0000 (10:35 +0200)
commit1ea28ffc4dbcdda64dc2e774c186f668ef7b030f
treed83681ad83339e990f72a6892e5bcf867601e557
parent04916953584332b457a9485eee0724f33bbb9ba8
parent0e730494160d973400aed8d2addd1f58a0ec883e
Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e'

* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
libavfilter/x86/vf_gradfun_init.c

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