[Ffmpeg-devel] Re: [Ffmpeg-cvslog] CVS: ffmpeg/libavcodec Makefile, 1.243, 1.244 dsputil.h, 1.128, 1.129 fft.c, 1.10, 1.11

[Guillaume POIRIER]

On 5/14/06, Dominik 'Rathann' Mierzejewski <dominik at rangers.eu.org> wrote:
> On Wednesday, 08 March 2006 at 05:13, Corey Hickey CVS wrote:
> > Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
> > In directory mail:/var2/tmp/cvs-serv22424/libavcodec
> >
> > Modified Files:
> >       Makefile dsputil.h fft.c
> > Log Message:
> > 3DNow! & Extended 3DNow! versions of FFT
> >
> > Patch by Zuxy Meng, zuxy <<dot>> meng >>at<< gmail <<dot>> com
> > Minor non-functional diff-related fixes by me.
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
> > retrieving revision 1.243
> > retrieving revision 1.244
> > diff -u -d -r1.243 -r1.244
> > --- Makefile  17 Feb 2006 03:17:42 -0000      1.243
> > +++ Makefile  8 Mar 2006 04:13:55 -0000       1.244
> > @@ -330,7 +330,7 @@
> >       i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
> >       i386/idct_mmx.o i386/motion_est_mmx.o \
> >       i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
> > -     i386/vp3dsp_sse2.o
> > +     i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o
> >  ifeq ($(CONFIG_GPL),yes)
> >  OBJS += i386/idct_mmx_xvid.o
> >  endif
> > @@ -338,6 +338,10 @@
> >  i386/fft_sse.o: CFLAGS+= -msse
> >  depend: CFLAGS+= -msse
> >  endif
> > +ifdef TARGET_BUILTIN_3DNOW
> > +i386/fft_3dn.o: CFLAGS+= -m3dnow
> > +i386/fft_3dn2.o: CFLAGS+= -march=athlon
> > +endif
>
> The above breaks compilation on x86_64. Why has nobody noticed it before?
>
> >From poirierg@#mplayerdev:
> [...]
> /usr/lib/gcc-snapshot/bin/gcc -I../libvo -I../../libvo
> -march=k8 -mtune=k8 -O3 -ffast-math -D_REENTRANT -D_LARGEFILE_SOURCE
> -D_FILE_OFFSET_BITS=64  -DHAVE_AV_CONFIG_H -I..
> -I/mnt/homes/guillaume/main-official/libavutil -D_FILE_OFFSET_BITS=64
> -D_LARGEFILE_SOURCE -D_GNU_SOURCE   -march=athlon  -c -o i386/fft_3dn2.o
> i386/fft_3dn2.c
> i386/fft_3dn2.c:1: error: CPU you selected does not support x86-64
> instruction set
> make[1]: *** [i386/fft_3dn2.o] Error 1
> make[1]: Leaving directory `/mnt/homes/guillaume/main-official/libavcodec'
> make: *** [libavcodec/libavcodec.a] Erreur 2
> [...]
>
> I can't test right now, but I think a simple s/-march=athlon/-m3dnow/ would
> suffice.

Fixed in CVS.

Guillaume


-- 
I am disillusioned enough to know that no man's opinion on any subject
is worth a damn unless backed up with enough genuine information to
make him really know what he's talking about.

-- H. P. Lovecraft (about the flamewars on FFmpeg and MPlayer-dev mailing lists)
http://www.brainyquote.com/quotes/quotes/h/hplovecr278144.html