Rename libavcodec/i386/ --> libavcodec/x86/.

It contains optimizations that are not specific to i386 and
libavutil uses this naming scheme already.

Originally committed as revision 16270 to svn://svn.ffmpeg.org/ffmpeg/trunk

44 files changed, 58 insertions, 58 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index e4fb30d6e9..4786d66951 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -392,37 +392,37 @@ OBJS-$(HAVE_PTHREADS)                  += pthread.o
 OBJS-$(HAVE_W32THREADS)                += w32thread.o
 
 # processor-specific code
-MMX-OBJS-$(CONFIG_CAVS_DECODER)        += i386/cavsdsp_mmx.o
-MMX-OBJS-$(CONFIG_ENCODERS)            += i386/dsputilenc_mmx.o
-MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += i386/flacdsp_mmx.o
-MMX-OBJS-$(CONFIG_GPL)                 += i386/idct_mmx.o
-MMX-OBJS-$(CONFIG_SNOW_DECODER)        += i386/snowdsp_mmx.o
-MMX-OBJS-$(CONFIG_THEORA_DECODER)      += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VC1_DECODER)         += i386/vc1dsp_mmx.o
-MMX-OBJS-$(CONFIG_VP3_DECODER)         += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP5_DECODER)         += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6_DECODER)         += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6A_DECODER)        += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_VP6F_DECODER)        += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
-MMX-OBJS-$(CONFIG_WMV3_DECODER)        += i386/vc1dsp_mmx.o
-MMX-OBJS-$(HAVE_YASM)                  += i386/dsputil_yasm.o \
-                                          i386/h264_deblock_sse2.o
-
-OBJS-$(HAVE_MMX)                       += i386/cpuid.o                  \
-                                          i386/dnxhd_mmx.o              \
-                                          i386/dsputil_mmx.o            \
-                                          i386/fdct_mmx.o               \
-                                          i386/idct_mmx_xvid.o          \
-                                          i386/idct_sse2_xvid.o         \
-                                          i386/motion_est_mmx.o         \
-                                          i386/mpegvideo_mmx.o          \
-                                          i386/simple_idct_mmx.o        \
+MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
+MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
+MMX-OBJS-$(CONFIG_FLAC_ENCODER)        += x86/flacdsp_mmx.o
+MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o
+MMX-OBJS-$(CONFIG_SNOW_DECODER)        += x86/snowdsp_mmx.o
+MMX-OBJS-$(CONFIG_THEORA_DECODER)      += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o
+MMX-OBJS-$(CONFIG_VP3_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP5_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP6_DECODER)         += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP6A_DECODER)        += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_VP6F_DECODER)        += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
+MMX-OBJS-$(CONFIG_WMV3_DECODER)        += x86/vc1dsp_mmx.o
+MMX-OBJS-$(HAVE_YASM)                  += x86/dsputil_yasm.o            \
+                                          x86/h264_deblock_sse2.o       \
+
+OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
+                                          x86/dnxhd_mmx.o               \
+                                          x86/dsputil_mmx.o             \
+                                          x86/fdct_mmx.o                \
+                                          x86/idct_mmx_xvid.o           \
+                                          x86/idct_sse2_xvid.o          \
+                                          x86/motion_est_mmx.o          \
+                                          x86/mpegvideo_mmx.o           \
+                                          x86/simple_idct_mmx.o         \
                                           $(MMX-OBJS-yes)
 
-OBJS-$(CONFIG_FFT_MMX)                 += i386/fft_3dn.o                \
-                                          i386/fft_3dn2.o               \
-                                          i386/fft_mmx.o                \
-                                          i386/fft_sse.o                \
+OBJS-$(CONFIG_FFT_MMX)                 += x86/fft_3dn.o                 \
+                                          x86/fft_3dn2.o                \
+                                          x86/fft_mmx.o                 \
+                                          x86/fft_sse.o                 \
 
 OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.o         \
                                           alpha/dsputil_alpha_asm.o     \
@@ -498,10 +498,10 @@ OBJS-$(HAVE_VIS)                       += sparc/dsputil_vis.o           \
 
 TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow)
 TESTS-$(CONFIG_OLDSCALER) += imgresample-test$(EXESUF)
-TESTS-$(ARCH_X86) += i386/cpuid-test$(EXESUF) motion-test$(EXESUF)
+TESTS-$(ARCH_X86) += x86/cpuid-test$(EXESUF) motion-test$(EXESUF)
 
 CLEANFILES = apiexample$(EXESUF)
-DIRS = alpha arm bfin i386 mlib ppc ps2 sh4 sparc
+DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86
 
 include $(SUBDIR)../subdir.mak
 
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 53b4f3de14..04f75b05f6 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -38,7 +38,7 @@
 #include "aandcttab.h"
 #include "faandct.h"
 #include "faanidct.h"
-#include "i386/idct_xvid.h"
+#include "x86/idct_xvid.h"
 
 #undef printf
 #undef random
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c3e26c5ce3..30d7b748ea 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -36,7 +36,7 @@
 
 #include "cabac.h"
 #ifdef ARCH_X86
-#include "i386/h264_i386.h"
+#include "x86/h264_i386.h"
 #endif
 
 //#undef NDEBUG
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 3b6918bf5c..f5d9f85937 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -35,8 +35,8 @@
 #include "colorspace.h"
 
 #ifdef HAVE_MMX
-#include "i386/mmx.h"
-#include "i386/dsputil_mmx.h"
+#include "x86/mmx.h"
+#include "x86/dsputil_mmx.h"
 #endif
 
 #define xglue(x, y) x ## y
diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c
index d1d99c5144..6ca810c6b4 100644
--- a/libavcodec/imgresample.c
+++ b/libavcodec/imgresample.c
@@ -155,7 +155,7 @@ static void v_resample(uint8_t *dst, int dst_width, const uint8_t *src,
 
 #ifdef HAVE_MMX
 
-#include "i386/mmx.h"
+#include "x86/mmx.h"
 
 #define FILTER4(reg) \
 {\
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 486eed7822..26405dd6f1 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -26,7 +26,7 @@
 
 #ifdef ARCH_X86_32
 
-#include "i386/mathops.h"
+#include "x86/mathops.h"
 
 #elif defined(ARCH_ARM)
 
diff --git a/libavcodec/i386/cavsdsp_mmx.c b/libavcodec/x86/cavsdsp_mmx.c
index 2000ba524a..2000ba524a 100644
--- a/libavcodec/i386/cavsdsp_mmx.c
+++ b/libavcodec/x86/cavsdsp_mmx.c
diff --git a/libavcodec/i386/cpuid.c b/libavcodec/x86/cpuid.c
index cd33334ecf..cd33334ecf 100644
--- a/libavcodec/i386/cpuid.c
+++ b/libavcodec/x86/cpuid.c
diff --git a/libavcodec/i386/dnxhd_mmx.c b/libavcodec/x86/dnxhd_mmx.c
index 59bcb3929b..59bcb3929b 100644
--- a/libavcodec/i386/dnxhd_mmx.c
+++ b/libavcodec/x86/dnxhd_mmx.c
diff --git a/libavcodec/i386/dsputil_h264_template_mmx.c b/libavcodec/x86/dsputil_h264_template_mmx.c
index 0bf8732e35..0bf8732e35 100644
--- a/libavcodec/i386/dsputil_h264_template_mmx.c
+++ b/libavcodec/x86/dsputil_h264_template_mmx.c
diff --git a/libavcodec/i386/dsputil_h264_template_ssse3.c b/libavcodec/x86/dsputil_h264_template_ssse3.c
index e29e05e7c8..e29e05e7c8 100644
--- a/libavcodec/i386/dsputil_h264_template_ssse3.c
+++ b/libavcodec/x86/dsputil_h264_template_ssse3.c
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 2ec8c3255d..2ec8c3255d 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
diff --git a/libavcodec/i386/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h
index 7ff4cd6952..87617e3016 100644
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/x86/dsputil_mmx.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_I386_DSPUTIL_MMX_H
-#define AVCODEC_I386_DSPUTIL_MMX_H
+#ifndef AVCODEC_X86_DSPUTIL_MMX_H
+#define AVCODEC_X86_DSPUTIL_MMX_H
 
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
@@ -151,4 +151,4 @@ extern const double ff_pd_2[2];
 
 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
 
-#endif /* AVCODEC_I386_DSPUTIL_MMX_H */
+#endif /* AVCODEC_X86_DSPUTIL_MMX_H */
diff --git a/libavcodec/i386/dsputil_mmx_avg_template.c b/libavcodec/x86/dsputil_mmx_avg_template.c
index 616a12b44b..616a12b44b 100644
--- a/libavcodec/i386/dsputil_mmx_avg_template.c
+++ b/libavcodec/x86/dsputil_mmx_avg_template.c
diff --git a/libavcodec/i386/dsputil_mmx_qns_template.c b/libavcodec/x86/dsputil_mmx_qns_template.c
index d2dbfc5a58..d2dbfc5a58 100644
--- a/libavcodec/i386/dsputil_mmx_qns_template.c
+++ b/libavcodec/x86/dsputil_mmx_qns_template.c
diff --git a/libavcodec/i386/dsputil_mmx_rnd_template.c b/libavcodec/x86/dsputil_mmx_rnd_template.c
index 45ed59088e..45ed59088e 100644
--- a/libavcodec/i386/dsputil_mmx_rnd_template.c
+++ b/libavcodec/x86/dsputil_mmx_rnd_template.c
diff --git a/libavcodec/i386/dsputil_yasm.asm b/libavcodec/x86/dsputil_yasm.asm
index 91165f2fb7..91165f2fb7 100644
--- a/libavcodec/i386/dsputil_yasm.asm
+++ b/libavcodec/x86/dsputil_yasm.asm
diff --git a/libavcodec/i386/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
index 76b367822b..76b367822b 100644
--- a/libavcodec/i386/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
diff --git a/libavcodec/i386/fdct_mmx.c b/libavcodec/x86/fdct_mmx.c
index c87c1a78f3..c87c1a78f3 100644
--- a/libavcodec/i386/fdct_mmx.c
+++ b/libavcodec/x86/fdct_mmx.c
diff --git a/libavcodec/i386/fft_3dn.c b/libavcodec/x86/fft_3dn.c
index 6f2e2e8353..6f2e2e8353 100644
--- a/libavcodec/i386/fft_3dn.c
+++ b/libavcodec/x86/fft_3dn.c
diff --git a/libavcodec/i386/fft_3dn2.c b/libavcodec/x86/fft_3dn2.c
index 1f30edc99d..1f30edc99d 100644
--- a/libavcodec/i386/fft_3dn2.c
+++ b/libavcodec/x86/fft_3dn2.c
diff --git a/libavcodec/i386/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm
index 39718677ae..39718677ae 100644
--- a/libavcodec/i386/fft_mmx.asm
+++ b/libavcodec/x86/fft_mmx.asm
diff --git a/libavcodec/i386/fft_sse.c b/libavcodec/x86/fft_sse.c
index deced3b929..deced3b929 100644
--- a/libavcodec/i386/fft_sse.c
+++ b/libavcodec/x86/fft_sse.c
diff --git a/libavcodec/i386/flacdsp_mmx.c b/libavcodec/x86/flacdsp_mmx.c
index 01c0d7ae8a..01c0d7ae8a 100644
--- a/libavcodec/i386/flacdsp_mmx.c
+++ b/libavcodec/x86/flacdsp_mmx.c
diff --git a/libavcodec/i386/h264_deblock_sse2.asm b/libavcodec/x86/h264_deblock_sse2.asm
index d59de919be..d59de919be 100644
--- a/libavcodec/i386/h264_deblock_sse2.asm
+++ b/libavcodec/x86/h264_deblock_sse2.asm
diff --git a/libavcodec/i386/h264_i386.h b/libavcodec/x86/h264_i386.h
index ed62dd6c2e..909c27490d 100644
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/x86/h264_i386.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVCODEC_I386_H264_I386_H
-#define AVCODEC_I386_H264_I386_H
+#ifndef AVCODEC_X86_H264_I386_H
+#define AVCODEC_X86_H264_I386_H
 
 #include "libavcodec/cabac.h"
 
@@ -152,4 +152,4 @@ static int decode_significance_8x8_x86(CABACContext *c,
 #endif /* defined(ARCH_X86) && defined(HAVE_7REGS) &&                 */
        /* defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
 
-#endif /* AVCODEC_I386_H264_I386_H */
+#endif /* AVCODEC_X86_H264_I386_H */
diff --git a/libavcodec/i386/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c
index 7d19f995ec..7d19f995ec 100644
--- a/libavcodec/i386/h264dsp_mmx.c
+++ b/libavcodec/x86/h264dsp_mmx.c
diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/x86/idct_mmx.c
index aed934c04d..aed934c04d 100644
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/x86/idct_mmx.c
diff --git a/libavcodec/i386/idct_mmx_xvid.c b/libavcodec/x86/idct_mmx_xvid.c
index d4fdd7a54a..d4fdd7a54a 100644
--- a/libavcodec/i386/idct_mmx_xvid.c
+++ b/libavcodec/x86/idct_mmx_xvid.c
diff --git a/libavcodec/i386/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c
index d8711a2ee2..d8711a2ee2 100644
--- a/libavcodec/i386/idct_sse2_xvid.c
+++ b/libavcodec/x86/idct_sse2_xvid.c
diff --git a/libavcodec/i386/idct_xvid.h b/libavcodec/x86/idct_xvid.h
index 0bf45d5d11..bddbdb95c0 100644
--- a/libavcodec/i386/idct_xvid.h
+++ b/libavcodec/x86/idct_xvid.h
@@ -23,8 +23,8 @@
  * header for Xvid IDCT functions
  */
 
-#ifndef AVCODEC_I386_IDCT_XVID_H
-#define AVCODEC_I386_IDCT_XVID_H
+#ifndef AVCODEC_X86_IDCT_XVID_H
+#define AVCODEC_X86_IDCT_XVID_H
 
 #include <stdint.h>
 
@@ -34,4 +34,4 @@ void ff_idct_xvid_sse2(short *block);
 void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block);
 void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block);
 
-#endif /* AVCODEC_I386_IDCT_XVID_H */
+#endif /* AVCODEC_X86_IDCT_XVID_H */
diff --git a/libavcodec/i386/mathops.h b/libavcodec/x86/mathops.h
index 77c72d85ea..95377acab8 100644
--- a/libavcodec/i386/mathops.h
+++ b/libavcodec/x86/mathops.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_I386_MATHOPS_H
-#define AVCODEC_I386_MATHOPS_H
+#ifndef AVCODEC_X86_MATHOPS_H
+#define AVCODEC_X86_MATHOPS_H
 
 #define MULL(ra, rb, shift) \
         ({ int rt, dummy; __asm__ (\
@@ -40,4 +40,4 @@
      __asm__ ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\
      rt; })
 
-#endif /* AVCODEC_I386_MATHOPS_H */
+#endif /* AVCODEC_X86_MATHOPS_H */
diff --git a/libavcodec/i386/mmx.h b/libavcodec/x86/mmx.h
index eaf7a0594a..d7a76bbd7d 100644
--- a/libavcodec/i386/mmx.h
+++ b/libavcodec/x86/mmx.h
@@ -18,8 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef AVCODEC_I386_MMX_H
-#define AVCODEC_I386_MMX_H
+#ifndef AVCODEC_X86_MMX_H
+#define AVCODEC_X86_MMX_H
 
 #warning Everything in this header is deprecated, use plain __asm__()! New code using this header will be rejected.
 
@@ -264,4 +264,4 @@
 #define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)
 
 
-#endif /* AVCODEC_I386_MMX_H */
+#endif /* AVCODEC_X86_MMX_H */
diff --git a/libavcodec/i386/motion_est_mmx.c b/libavcodec/x86/motion_est_mmx.c
index c866e8ad7b..c866e8ad7b 100644
--- a/libavcodec/i386/motion_est_mmx.c
+++ b/libavcodec/x86/motion_est_mmx.c
diff --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/x86/mpegvideo_mmx.c
index 406d3b8c07..406d3b8c07 100644
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/x86/mpegvideo_mmx.c
diff --git a/libavcodec/i386/mpegvideo_mmx_template.c b/libavcodec/x86/mpegvideo_mmx_template.c
index a1aae5fdd4..a1aae5fdd4 100644
--- a/libavcodec/i386/mpegvideo_mmx_template.c
+++ b/libavcodec/x86/mpegvideo_mmx_template.c
diff --git a/libavcodec/i386/simple_idct_mmx.c b/libavcodec/x86/simple_idct_mmx.c
index 6306fcbd44..6306fcbd44 100644
--- a/libavcodec/i386/simple_idct_mmx.c
+++ b/libavcodec/x86/simple_idct_mmx.c
diff --git a/libavcodec/i386/snowdsp_mmx.c b/libavcodec/x86/snowdsp_mmx.c
index 93119787fd..93119787fd 100644
--- a/libavcodec/i386/snowdsp_mmx.c
+++ b/libavcodec/x86/snowdsp_mmx.c
diff --git a/libavcodec/i386/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
index b5db0ed9e4..b5db0ed9e4 100644
--- a/libavcodec/i386/vc1dsp_mmx.c
+++ b/libavcodec/x86/vc1dsp_mmx.c
diff --git a/libavcodec/i386/vp3dsp_mmx.c b/libavcodec/x86/vp3dsp_mmx.c
index 010bfc65d6..010bfc65d6 100644
--- a/libavcodec/i386/vp3dsp_mmx.c
+++ b/libavcodec/x86/vp3dsp_mmx.c
diff --git a/libavcodec/i386/vp3dsp_mmx.h b/libavcodec/x86/vp3dsp_mmx.h
index 2e79913deb..e565a33023 100644
--- a/libavcodec/i386/vp3dsp_mmx.h
+++ b/libavcodec/x86/vp3dsp_mmx.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_I386_VP3DSP_MMX_H
-#define AVCODEC_I386_VP3DSP_MMX_H
+#ifndef AVCODEC_X86_VP3DSP_MMX_H
+#define AVCODEC_X86_VP3DSP_MMX_H
 
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
@@ -32,4 +32,4 @@ void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_v_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values);
 void ff_vp3_h_loop_filter_mmx2(uint8_t *src, int stride, int *bounding_values);
 
-#endif /* AVCODEC_I386_VP3DSP_MMX_H */
+#endif /* AVCODEC_X86_VP3DSP_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_sse2.c b/libavcodec/x86/vp3dsp_sse2.c
index 82670c74ef..82670c74ef 100644
--- a/libavcodec/i386/vp3dsp_sse2.c
+++ b/libavcodec/x86/vp3dsp_sse2.c
diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/x86/vp3dsp_sse2.h
index 55908c22a0..9094620eb2 100644
--- a/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/x86/vp3dsp_sse2.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_I386_VP3DSP_SSE2_H
-#define AVCODEC_I386_VP3DSP_SSE2_H
+#ifndef AVCODEC_X86_VP3DSP_SSE2_H
+#define AVCODEC_X86_VP3DSP_SSE2_H
 
 #include "libavcodec/dsputil.h"
 
@@ -28,4 +28,4 @@ void ff_vp3_idct_sse2(int16_t *input_data);
 void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif /* AVCODEC_I386_VP3DSP_SSE2_H */
+#endif /* AVCODEC_X86_VP3DSP_SSE2_H */
diff --git a/libavcodec/i386/x86inc.asm b/libavcodec/x86/x86inc.asm
index 3729b5b101..3729b5b101 100644
--- a/libavcodec/i386/x86inc.asm
+++ b/libavcodec/x86/x86inc.asm