Merge commit 'ad507d7907457e678900bac132122ba7be4644cb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 18:22:00 +0000 (19:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 18:22:00 +0000 (19:22 +0100)
* commit 'ad507d7907457e678900bac132122ba7be4644cb':
  x86: dcadsp: implement SSE lfe_dir

Conflicts:
libavcodec/x86/dcadsp.asm

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

Simple merge