Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fdct: Employ more specific ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86/fdct.c

@@ -34,7 +34,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/dct.h"
 
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
 
 //////////////////////////////////////////////////////////////////////
 //
@@ -556,6 +556,10 @@ void ff_fdct_mmx(int16_t *block)
     }
 }
 
+#endif /* HAVE_MMX_INLINE */
+
+#if HAVE_MMXEXT_INLINE
+
 void ff_fdct_mmxext(int16_t *block)
 {
     DECLARE_ALIGNED(8, int64_t, align_tmp)[16];
@@ -574,6 +578,10 @@ void ff_fdct_mmxext(int16_t *block)
     }
 }
 
+#endif /* HAVE_MMXEXT_INLINE */
+
+#if HAVE_SSE2_INLINE
+
 void ff_fdct_sse2(int16_t *block)
 {
     DECLARE_ALIGNED(16, int64_t, align_tmp)[16];
@@ -583,4 +591,4 @@ void ff_fdct_sse2(int16_t *block)
     fdct_row_sse2(block1, block);
 }
 
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_SSE2_INLINE */