[MPlayer-cvslog] r34286 - in trunk: cpudetect.c cpudetect.h libmpcodecs/pullup.c libmpcodecs/vf_decimate.c libmpcodecs/vf_divtc.c libmpcodecs/vf_filmdint.c libmpcodecs/vf_fspp.c libmpcodecs/vf_ilpack.c libmpcodecs/...

[Reimar Döffinger]

On Thu, Nov 03, 2011 at 02:24:46PM +0100, diego wrote:
> 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"

Wow, what an amazing nonsense. Wonder how that came to be (ok, I don't
wonder enough to actually make an effort to find out :-) ).