Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Oct 2013 09:37:37 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Oct 2013 09:37:47 +0000 (11:37 +0200)
* qatar/master:
  x86: fdct: Employ more specific ifdefs

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

Simple merge