Merge commit '1399931d'

* commit '1399931d':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

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

libavcodec/imgconvert.c

@@ -41,7 +41,7 @@
 #include "libavutil/imgutils.h"
 
 #if HAVE_MMX_EXTERNAL
-#include "x86/dsputil_mmx.h"
+#include "x86/dsputil_x86.h"
 #endif
 
 #define FF_COLOR_NA      -1

libavcodec/x86/ac3dsp_init.c

@@ -22,7 +22,7 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "libavcodec/ac3.h"
 #include "libavcodec/ac3dsp.h"
 

libavcodec/x86/cavsdsp.c

@@ -29,7 +29,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/cavsdsp.h"
 #include "constants.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "config.h"
 
 #if HAVE_MMX_INLINE

libavcodec/x86/dirac_dwt.c

@@ -21,7 +21,7 @@
  */
 
 #include "libavutil/x86/asm.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "dirac_dwt.h"
 
 #define COMPOSE_VERTICAL(ext, align) \

libavcodec/x86/diracdsp_mmx.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "diracdsp_mmx.h"
 
 void ff_put_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);

libavcodec/x86/dsputil_init.c

@@ -25,7 +25,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/dsputil.h"
 #include "libavcodec/simple_idct.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "idct_xvid.h"
 
 void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2,

libavcodec/x86/dsputil_mmx.c

@@ -28,7 +28,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/videodsp.h"
 #include "constants.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "diracdsp_mmx.h"
 
 #if HAVE_INLINE_ASM

libavcodec/x86/dsputilenc_mmx.c

@@ -30,7 +30,7 @@
 #include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "libavcodec/mathops.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size);
 void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size);

libavcodec/x86/fpel_mmx.c

@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_MMX_INLINE
 

libavcodec/x86/h264_qpel.c

@@ -25,7 +25,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/h264qpel.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_YASM
 void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,

libavcodec/x86/h264dsp_init.c

@@ -23,7 +23,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/h264dsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 /***********************************/
 /* IDCT */

libavcodec/x86/hpeldsp_init.c

@@ -25,7 +25,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/hpeldsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels,
                               ptrdiff_t line_size, int h);

libavcodec/x86/hpeldsp_mmx.c

@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_MMX_INLINE
 

libavcodec/x86/idct_mmx_xvid.c

@@ -44,7 +44,7 @@
 #include "config.h"
 #include "libavcodec/avcodec.h"
 #include "libavutil/mem.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "idct_xvid.h"
 
 #if HAVE_INLINE_ASM

libavcodec/x86/idct_sse2_xvid.c

@@ -41,7 +41,7 @@
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
 #include "idct_xvid.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 

libavcodec/x86/motion_est.c

@@ -26,7 +26,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/asm.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 

libavcodec/x86/mpegvideo.c

@@ -24,7 +24,7 @@
 #include "libavutil/x86/asm.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 

libavcodec/x86/mpegvideoenc.c

@@ -26,7 +26,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dct.h"
 #include "libavcodec/mpegvideo.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 extern uint16_t ff_inv_zigzag_direct16[64];
 

libavcodec/x86/rnd_mmx.c

@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 

libavcodec/x86/rv40dsp_init.c

@@ -30,7 +30,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
 #include "libavutil/x86/cpu.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_YASM
 void ff_put_rv40_chroma_mc8_mmx  (uint8_t *dst, uint8_t *src,

libavcodec/x86/simple_idct.c

@@ -21,7 +21,7 @@
  */
 #include "libavcodec/simple_idct.h"
 #include "libavutil/mem.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 

libavcodec/x86/snowdsp.c

@@ -24,7 +24,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/snow.h"
 #include "libavcodec/snow_dwt.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 
 #if HAVE_INLINE_ASM
 

libavcodec/x86/vc1dsp_init.c

@@ -27,7 +27,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "vc1dsp.h"
 #include "config.h"
 

libavcodec/x86/vc1dsp_mmx.c

@@ -30,7 +30,7 @@
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/vc1dsp.h"
 #include "constants.h"
-#include "dsputil_mmx.h"
+#include "dsputil_x86.h"
 #include "vc1dsp.h"
 
 #if HAVE_INLINE_ASM