Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 19:38:12 +0000 (20:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 19:38:39 +0000 (20:38 +0100)
* commit '08e3ea60ff4059341b74be04a428a38f7c3630b0':
  x86: synth filter float: implement SSE2 version

Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c

See: 2cdbcc004837ce092a14f326f24d97a29512a2c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c

Simple merge
Simple merge