Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jan 2013 12:18:10 +0000 (13:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jan 2013 12:20:25 +0000 (13:20 +0100)
commited8ff70d9ee02b9940803aee69462da548df663b
tree495891dd23a7f45f12682670719fe00a2c26fef0
parentb45e0c2573fa5ce8c4821605f35ac4cad946e9d3
parent822b0728f0e3c3ba60b20bd4fd971d5c4a3fe3e9
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Drop some unused macro definitions
  x86: Add a Yasm-based emms() replacement

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_mmx.c
libavutil/internal.h
libavutil/x86/emms.asm
libavutil/x86/emms.h