diff options
30 files changed, 32 insertions, 32 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index e20f9b251a..c4ef22e74c 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -31,7 +31,7 @@ #include "dsputil.h" #include "mpegvideo.h" #include "msmpeg4.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "h263.h" #include "mpeg4video.h" #include "msmpeg4data.h" diff --git a/libavcodec/x86/ac3dsp_mmx.c b/libavcodec/x86/ac3dsp_mmx.c index 0ac8685c6d..f3db67a84f 100644 --- a/libavcodec/x86/ac3dsp_mmx.c +++ b/libavcodec/x86/ac3dsp_mmx.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "dsputil_mmx.h" #include "libavcodec/ac3dsp.h" diff --git a/libavcodec/x86/cabac.h b/libavcodec/x86/cabac.h index 02dbc54db7..389f155745 100644 --- a/libavcodec/x86/cabac.h +++ b/libavcodec/x86/cabac.h @@ -23,7 +23,7 @@ #include "libavcodec/cabac.h" #include "libavutil/attributes.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/internal.h" #include "config.h" diff --git a/libavcodec/x86/cavsdsp_mmx.c b/libavcodec/x86/cavsdsp_mmx.c index 4ed7d8e598..e94003956f 100644 --- a/libavcodec/x86/cavsdsp_mmx.c +++ b/libavcodec/x86/cavsdsp_mmx.c @@ -24,7 +24,7 @@ #include "libavutil/common.h" #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/cavsdsp.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/dnxhd_mmx.c b/libavcodec/x86/dnxhd_mmx.c index 54293aa280..12fe3ae55f 100644 --- a/libavcodec/x86/dnxhd_mmx.c +++ b/libavcodec/x86/dnxhd_mmx.c @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dnxhdenc.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index f13e920bed..93f9db8299 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -23,7 +23,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/h264dsp.h" #include "libavcodec/mpegvideo.h" diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h index f1db78d5c4..316c384d1a 100644 --- a/libavcodec/x86/dsputil_mmx.h +++ b/libavcodec/x86/dsputil_mmx.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "libavcodec/dsputil.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" typedef struct { uint64_t a, b; } xmm_reg; diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 0ac4d2c10d..c0ef0bac3e 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -23,7 +23,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/mathops.h" diff --git a/libavcodec/x86/fdct_mmx.c b/libavcodec/x86/fdct_mmx.c index 3614fd151a..f9bd3f2508 100644 --- a/libavcodec/x86/fdct_mmx.c +++ b/libavcodec/x86/fdct_mmx.c @@ -31,7 +31,7 @@ */ #include "libavutil/common.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c index fbdc5262b9..6f3d14aedc 100644 --- a/libavcodec/x86/fmtconvert_mmx.c +++ b/libavcodec/x86/fmtconvert_mmx.c @@ -23,7 +23,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/fmtconvert.h" #include "libavcodec/dsputil.h" diff --git a/libavcodec/x86/h264dsp_mmx.c b/libavcodec/x86/h264dsp_mmx.c index 0612ffbb8b..f24f751fb3 100644 --- a/libavcodec/x86/h264dsp_mmx.c +++ b/libavcodec/x86/h264dsp_mmx.c @@ -19,7 +19,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/h264dsp.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index 8249e97ccf..b58db79a5a 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -39,7 +39,7 @@ */ #include "libavcodec/dsputil.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "idct_xvid.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/lpc_mmx.c b/libavcodec/x86/lpc_mmx.c index 27bebe856a..609f4e5cd2 100644 --- a/libavcodec/x86/lpc_mmx.c +++ b/libavcodec/x86/lpc_mmx.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #include "libavcodec/lpc.h" diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 400855d7c4..16e38c3313 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/mlp.h" diff --git a/libavcodec/x86/motion_est_mmx.c b/libavcodec/x86/motion_est_mmx.c index 68b1633a47..c3136eb1fe 100644 --- a/libavcodec/x86/motion_est_mmx.c +++ b/libavcodec/x86/motion_est_mmx.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/mpegaudiodec_mmx.c b/libavcodec/x86/mpegaudiodec_mmx.c index 88a347796c..701ae75138 100644 --- a/libavcodec/x86/mpegaudiodec_mmx.c +++ b/libavcodec/x86/mpegaudiodec_mmx.c @@ -20,7 +20,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegaudiodsp.h" diff --git a/libavcodec/x86/mpegvideo_mmx.c b/libavcodec/x86/mpegvideo_mmx.c index 85f6866342..46ed30a76d 100644 --- a/libavcodec/x86/mpegvideo_mmx.c +++ b/libavcodec/x86/mpegvideo_mmx.c @@ -23,7 +23,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index 7284a9beaf..b07ad89f0e 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -20,7 +20,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/rv34dsp.h" diff --git a/libavcodec/x86/snowdsp_mmx.c b/libavcodec/x86/snowdsp_mmx.c index 770cc1cc73..fb190d8d8d 100644 --- a/libavcodec/x86/snowdsp_mmx.c +++ b/libavcodec/x86/snowdsp_mmx.c @@ -20,7 +20,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" #include "libavcodec/snow.h" #include "libavcodec/dwt.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index aae08c2364..9200798310 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -25,7 +25,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "dsputil_mmx.h" #include "libavcodec/vc1dsp.h" diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp56dsp_init.c index 69c197e520..aa5f5e5d4f 100644 --- a/libavcodec/x86/vp56dsp_init.c +++ b/libavcodec/x86/vp56dsp_init.c @@ -21,7 +21,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/dsputil.h" #include "libavcodec/vp56dsp.h" diff --git a/libavcodec/x86/vp8dsp-init.c b/libavcodec/x86/vp8dsp-init.c index 64dd8ceadf..4568a3864c 100644 --- a/libavcodec/x86/vp8dsp-init.c +++ b/libavcodec/x86/vp8dsp-init.c @@ -21,7 +21,7 @@ */ #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/vp8dsp.h" #if HAVE_YASM diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c index b45256d011..4cd481c05f 100644 --- a/libavfilter/x86/gradfun.c +++ b/libavfilter/x86/gradfun.c @@ -20,7 +20,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavfilter/gradfun.h" #if HAVE_INLINE_ASM diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index 81b536acda..ee3a016bd0 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -20,7 +20,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/x86/dsputil_mmx.h" #include "libavfilter/yadif.h" diff --git a/libavutil/x86_cpu.h b/libavutil/x86/asm.h index f84eba67f5..b447fabb57 100644 --- a/libavutil/x86_cpu.h +++ b/libavutil/x86/asm.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVUTIL_X86_CPU_H -#define AVUTIL_X86_CPU_H +#ifndef AVUTIL_X86_ASM_H +#define AVUTIL_X86_ASM_H #include <stdint.h> #include "config.h" @@ -95,4 +95,4 @@ typedef int x86_reg; # define XMM_CLOBBERS_ONLY(...) #endif -#endif /* AVUTIL_X86_CPU_H */ +#endif /* AVUTIL_X86_ASM_H */ diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index a63b564985..645bb83f77 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <string.h> -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #if HAVE_INLINE_ASM diff --git a/libswscale/utils.c b/libswscale/utils.c index 9a57405d2c..f890b5cee1 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -45,7 +45,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "rgb2rgb.h" #include "swscale.h" #include "swscale_internal.h" diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 066749c22f..f201281fac 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -27,7 +27,7 @@ #include "config.h" #include "libavutil/attributes.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #include "libavutil/bswap.h" #include "libswscale/rgb2rgb.h" diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 57d270b09d..9683c0cedd 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -24,7 +24,7 @@ #include "libswscale/swscale_internal.h" #include "libavutil/attributes.h" #include "libavutil/intreadwrite.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 501993ae42..93755493ab 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -34,7 +34,7 @@ #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" #include "libavutil/attributes.h" -#include "libavutil/x86_cpu.h" +#include "libavutil/x86/asm.h" #include "libavutil/cpu.h" #if HAVE_INLINE_ASM |