[MPlayer-cvslog] r28037 - trunk/cpudetect.c

[Diego Biurrun]

On Thu, Jan 15, 2009 at 06:54:35PM +0100, Attila Kinali wrote:
> On Tue, 25 Nov 2008 19:36:50 +0100 (CET)
> cehoyos <subversion at mplayerhq.hu> wrote:
> 
> > --- trunk/cpudetect.c	(original)
> > +++ trunk/cpudetect.c	Tue Nov 25 19:36:50 2008
> > @@ -57,10 +57,17 @@ static int has_cpuid(void)
> >  
> >  // code from libavcodec:
> > +#ifdef ARCH_X86_64
> 
> This line breaks compilation on x86 as ARCH_X86_64 is always defined,
> either as 1 or 0.

It's not this line, it's the change from #undef ARCH_ to defining
ARCH_ to 1/0.

Right now, we cannot have both FFmpeg and MPlayer working at the same
time, at least not easily.

Diego