Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:11:35 +0000 (10:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Nov 2013 09:13:14 +0000 (10:13 +0100)
commit7146eacfc5f20dea719d6581d72b7532ab39688d
treea79b9e5bb94ac5d34903676518827c577513e261
parent0db04ca01dfa34659abc407648bdac507df297f5
parent1700b4e678ed329611a16b20d11e64b7abda4839
Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839'

* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
  x86: vp8dsp: Split loopfilter code into a separate file

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile
libavcodec/x86/vp8dsp.asm
libavcodec/x86/vp8dsp_loopfilter.asm