[Ffmpeg-devel] [PATCH] 3DNow! version of FFT

Corey Hickey bugfood-ml
Wed Mar 8 05:23:27 CET 2006


Zuxy Meng wrote:
> Hi,
> 
> 2006/3/8, Corey Hickey <bugfood-ml at fatooh.org>:
> 
>>Thanks, I forgot to mention that before I hit send. The use of mixed
>>tabs and spaces makes some parts end up indented a bit oddly, so I
>>wanted to give Zuxy a chance to clean it up if he cared.
> 
> 
> Sorry for the trouble. See if this looks better.

Mostly.

> --- ffmpeg/libavcodec/Makefile	2006-02-17 11:17:42.000000000 +0800
> +++ ffmpeg.new/libavcodec/Makefile	2006-03-07 08:31:56.000000000 +0800
> @@ -330,7 +330,7 @@ OBJS += i386/fdct_mmx.o i386/cputest.o \
>  	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

Except in Makefiles, which (as far as I know) have to use tabs. :)

Hmm... I guess clean-diff doesn't care, but maybe it should.

> --- ffmpeg/libavcodec/i386/fft_3dn.c	1970-01-01 08:00:00.000000000 +0800
> +++ ffmpeg.new/libavcodec/i386/fft_3dn.c	2006-03-07 08:29:13.000000000 +0800
> @@ -0,0 +1,138 @@

Did you edit the patch directly? It's usually safer to apply the patch,
edit your files, and re-diff. In this case, it looks like you removed a
couple non-essential braces, which changed the line numbers and made the
patch not apply. Same for fft_3dn2.c.

Anyway, I fixed that up, tested, and applied it.

-Corey





More information about the ffmpeg-devel mailing list