Author: diego Date: Thu Nov 3 14:24:46 2011 New Revision: 34286 Log: cpudetect: clean up libavutil #includes libavutil/x86_cpu.h is not used directly in cpudetect.h, so remove it from there and #include it directly in files that need it. This avoids libavutil headers appearing in #include cascades in loader/ and causing problems for e.g. Doxygen. Modified: trunk/cpudetect.c trunk/cpudetect.h trunk/libmpcodecs/pullup.c trunk/libmpcodecs/vf_decimate.c trunk/libmpcodecs/vf_divtc.c trunk/libmpcodecs/vf_filmdint.c trunk/libmpcodecs/vf_fspp.c trunk/libmpcodecs/vf_ilpack.c trunk/libmpcodecs/vf_ivtc.c trunk/libmpcodecs/vf_noise.c trunk/libmpcodecs/vf_tfields.c trunk/libmpcodecs/vf_yadif.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/cpudetect.c Thu Nov 3 14:24:46 2011 (r34286) @@ -16,6 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "libavutil/x86_cpu.h" #include "config.h" #include "cpudetect.h" #include "mp_msg.h" Modified: trunk/cpudetect.h ============================================================================== --- trunk/cpudetect.h Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/cpudetect.h Thu Nov 3 14:24:46 2011 (r34286) @@ -19,15 +19,11 @@ #ifndef MPLAYER_CPUDETECT_H #define MPLAYER_CPUDETECT_H -#include "config.h" - #define CPUTYPE_I386 3 #define CPUTYPE_I486 4 #define CPUTYPE_I586 5 #define CPUTYPE_I686 6 -#include "libavutil/x86_cpu.h" - typedef struct cpucaps_s { int cpuType; int cpuModel; Modified: trunk/libmpcodecs/pullup.c ============================================================================== --- trunk/libmpcodecs/pullup.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/pullup.c Thu Nov 3 14:24:46 2011 (r34286) @@ -19,9 +19,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + +#include "libavutil/x86_cpu.h" #include "config.h" #include "pullup.h" -#include "cpudetect.h" Modified: trunk/libmpcodecs/vf_decimate.c ============================================================================== --- trunk/libmpcodecs/vf_decimate.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_decimate.c Thu Nov 3 14:24:46 2011 (r34286) @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" - +#include "libavutil/x86_cpu.h" #include "libvo/fastmemcpy.h" Modified: trunk/libmpcodecs/vf_divtc.c ============================================================================== --- trunk/libmpcodecs/vf_divtc.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_divtc.c Thu Nov 3 14:24:46 2011 (r34286) @@ -26,6 +26,7 @@ #include "mp_msg.h" #include "cpudetect.h" #include "libavutil/common.h" +#include "libavutil/x86_cpu.h" #include "mpbswap.h" #include "img_format.h" Modified: trunk/libmpcodecs/vf_filmdint.c ============================================================================== --- trunk/libmpcodecs/vf_filmdint.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_filmdint.c Thu Nov 3 14:24:46 2011 (r34286) @@ -30,7 +30,7 @@ #include "vd.h" #include "vf.h" #include "cmmx.h" - +#include "libavutil/x86_cpu.h" #include "libvo/fastmemcpy.h" #define NUM_STORED 4 Modified: trunk/libmpcodecs/vf_fspp.c ============================================================================== --- trunk/libmpcodecs/vf_fspp.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_fspp.c Thu Nov 3 14:24:46 2011 (r34286) @@ -51,6 +51,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" +#include "libavutil/x86_cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" Modified: trunk/libmpcodecs/vf_ilpack.c ============================================================================== --- trunk/libmpcodecs/vf_ilpack.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_ilpack.c Thu Nov 3 14:24:46 2011 (r34286) @@ -29,6 +29,7 @@ #include "mp_image.h" #include "vf.h" #include "libavutil/attributes.h" +#include "libavutil/x86_cpu.h" typedef void (pack_func_t)(unsigned char *dst, unsigned char *y, unsigned char *u, unsigned char *v, int w, int us, int vs); Modified: trunk/libmpcodecs/vf_ivtc.c ============================================================================== --- trunk/libmpcodecs/vf_ivtc.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_ivtc.c Thu Nov 3 14:24:46 2011 (r34286) @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" - +#include "libavutil/x86_cpu.h" #include "libvo/fastmemcpy.h" Modified: trunk/libmpcodecs/vf_noise.c ============================================================================== --- trunk/libmpcodecs/vf_noise.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_noise.c Thu Nov 3 14:24:46 2011 (r34286) @@ -37,6 +37,7 @@ #include "vf.h" #include "libvo/fastmemcpy.h" #include "libavutil/mem.h" +#include "libavutil/x86_cpu.h" #define MAX_NOISE 4096 #define MAX_SHIFT 1024 Modified: trunk/libmpcodecs/vf_tfields.c ============================================================================== --- trunk/libmpcodecs/vf_tfields.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_tfields.c Thu Nov 3 14:24:46 2011 (r34286) @@ -27,7 +27,7 @@ #include "img_format.h" #include "mp_image.h" #include "vf.h" - +#include "libavutil/x86_cpu.h" #include "libmpdemux/demuxer.h" #include "libvo/fastmemcpy.h" Modified: trunk/libmpcodecs/vf_yadif.c ============================================================================== --- trunk/libmpcodecs/vf_yadif.c Wed Nov 2 14:03:20 2011 (r34285) +++ trunk/libmpcodecs/vf_yadif.c Thu Nov 3 14:24:46 2011 (r34286) @@ -34,6 +34,7 @@ #include "libmpdemux/demuxer.h" #include "libvo/fastmemcpy.h" #include "libavutil/common.h" +#include "libavutil/x86_cpu.h" //===========================================================================//