Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Feb 2013 11:35:13 +0000 (12:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Feb 2013 11:35:18 +0000 (12:35 +0100)
* qatar/master:
  x86: dsputil: Drop some unused function #defines

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputil_mmx.c

Simple merge