]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Apr 2013 11:29:14 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Apr 2013 11:30:19 +0000 (13:30 +0200)
commit32bac65ba0bece53dcc28ec7ba3f678963485c9a
tree319b982dbf6d9a03e8fba9f95f188efa134162c7
parent84bfa8beb708d7594d298b438d3fa9c21630da97
parentf4b0d12f5b3fb2fe825fb2ac9b2d9d9374baa5c5
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: sbrdsp: Implement SSE neg_odd_64

Conflicts:
libavcodec/x86/sbrdsp.asm

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