# HG changeset patch
# User diego
# Date 1358699785 0
# Node ID b4ce15212bfc3f706b836d24e4c94f5056016e45
# Parent  ec0cc8013b3a3d19844b71e59a57b4061a52753e
Replace obsolete x86_cpu.h #includes by the correct header.

diff -r ec0cc8013b3a -r b4ce15212bfc cpudetect.c
--- a/cpudetect.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/cpudetect.c	Sun Jan 20 16:36:25 2013 +0000
@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "config.h"
 #include "cpudetect.h"
 #include "mp_msg.h"
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/pullup.c
--- a/libmpcodecs/pullup.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/pullup.c	Sun Jan 20 16:36:25 2013 +0000
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "config.h"
 #include "pullup.h"
 
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_ass.c
--- a/libmpcodecs/vf_ass.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_ass.c	Sun Jan 20 16:36:25 2013 +0000
@@ -46,7 +46,7 @@
 #include "sub/eosd.h"
 
 #include "cpudetect.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 
 #define _r(c)  ((c)>>24)
 #define _g(c)  (((c)>>16)&0xFF)
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_decimate.c
--- a/libmpcodecs/vf_decimate.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_decimate.c	Sun Jan 20 16:36:25 2013 +0000
@@ -27,7 +27,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "libvo/fastmemcpy.h"
 
 
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_divtc.c
--- a/libmpcodecs/vf_divtc.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_divtc.c	Sun Jan 20 16:36:25 2013 +0000
@@ -26,7 +26,7 @@
 #include "mp_msg.h"
 #include "cpudetect.h"
 #include "libavutil/common.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "mpbswap.h"
 
 #include "img_format.h"
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_filmdint.c
--- a/libmpcodecs/vf_filmdint.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_filmdint.c	Sun Jan 20 16:36:25 2013 +0000
@@ -30,7 +30,7 @@
 #include "vd.h"
 #include "vf.h"
 #include "cmmx.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "libvo/fastmemcpy.h"
 
 #define NUM_STORED 4
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_fspp.c
--- a/libmpcodecs/vf_fspp.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_fspp.c	Sun Jan 20 16:36:25 2013 +0000
@@ -51,7 +51,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_gradfun.c
--- a/libmpcodecs/vf_gradfun.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_gradfun.c	Sun Jan 20 16:36:25 2013 +0000
@@ -39,7 +39,7 @@
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
 #include "libavutil/avutil.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 
 struct vf_priv_s {
     int thresh;
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_ilpack.c
--- a/libmpcodecs/vf_ilpack.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_ilpack.c	Sun Jan 20 16:36:25 2013 +0000
@@ -29,7 +29,7 @@
 #include "mp_image.h"
 #include "vf.h"
 #include "libavutil/attributes.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 
 typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
     unsigned char *u, unsigned char *v, int w, int us, int vs);
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_ivtc.c
--- a/libmpcodecs/vf_ivtc.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_ivtc.c	Sun Jan 20 16:36:25 2013 +0000
@@ -27,7 +27,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "libvo/fastmemcpy.h"
 
 
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_noise.c
--- a/libmpcodecs/vf_noise.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_noise.c	Sun Jan 20 16:36:25 2013 +0000
@@ -37,7 +37,7 @@
 #include "vf.h"
 #include "libvo/fastmemcpy.h"
 #include "libavutil/mem.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 
 #define MAX_NOISE 4096
 #define MAX_SHIFT 1024
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_tfields.c
--- a/libmpcodecs/vf_tfields.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_tfields.c	Sun Jan 20 16:36:25 2013 +0000
@@ -27,7 +27,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 #include "libmpdemux/demuxer.h"
 #include "libvo/fastmemcpy.h"
 
diff -r ec0cc8013b3a -r b4ce15212bfc libmpcodecs/vf_yadif.c
--- a/libmpcodecs/vf_yadif.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libmpcodecs/vf_yadif.c	Sun Jan 20 16:36:25 2013 +0000
@@ -34,7 +34,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libvo/fastmemcpy.h"
 #include "libavutil/common.h"
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 
 //===========================================================================//
 
diff -r ec0cc8013b3a -r b4ce15212bfc libvo/aclib_template.c
--- a/libvo/aclib_template.c	Sun Jan 20 15:41:53 2013 +0000
+++ b/libvo/aclib_template.c	Sun Jan 20 16:36:25 2013 +0000
@@ -80,7 +80,7 @@
 // 3dnow memcpy support from kernel 2.4.2
 //  by Pontscho/fresh!mindworkz
 
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
 
 #undef HAVE_ONLY_MMX1
 #if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE