[FFmpeg-devel] [PATCH] Clean up in C VC-1 DSP functions

[infernix]

Christophe GISQUET wrote:
> Here are 3 patches for that purpose:
> - vc1dsp_c_cosmetics.diff renames the static void ff_vc1* functions to vc1*
> - vc1dsp_c_macroify.diff changes their declaration with a macro
> - finally vc1dsp_c_proto.diff is the requested prototype change
> They should be applied in that order.

This also breaks compilation but in a different way. Again, unsure if 
it's supposed to break. With just these patches applied (so not the mmx 
patch), on Debian Etch x86_64:

cc -I../libswscale -I../libavcodec  -DHAVE_AV_CONFIG_H 
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -I.. -I.. 
-I../libavutil -Wdisabled-optimization -Wno-pointer-sign 
-Wdeclaration-after-statement -I. -I.. -I../libavutil -Wall -Wno-switch 
-Wpointer-arith -Wredundant-decls -O4 -march=nocona -mtune=nocona -pipe 
-ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE 
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I/usr/include/directfb 
-I/usr/include -I/usr/include/  -I/usr/include/SDL  -D_REENTRANT 
-I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 
-I/usr/lib/glib-2.0/include   -I/usr/include/freetype2 -I/usr/include 
-DPNG_NO_MMX_CODE -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
-I/usr/include/freetype2 -I/usr/include/libpng12    -c -o vc1dsp.o vc1dsp.c
In file included from dsputil.h:33,
                  from vc1dsp.c:28:
avcodec.h:2252: warning: 'ImgReSampleContext' is deprecated
avcodec.h:2258: warning: 'ImgReSampleContext' is deprecated
vc1dsp.c:381: error: expected declaration specifiers or '...' before 
numeric constant
vc1dsp.c:381: error: expected declaration specifiers or '...' before 
numeric constant
vc1dsp.c:382: warning: return type defaults to 'int'
vc1dsp.c: In function 'PUT_VC1_MSPEL':
vc1dsp.c:382: error: expected declaration specifiers before 'PUT_VC1_MSPEL'
vc1dsp.c:424: error: expected '{' at end of input
make[2]: *** [vc1dsp.o] Error 1
make[2]: Leaving directory 
`/home/gerben/src/mplayer/trunk-20070704/libavcodec'
make[1]: *** [libavcodec/libavcodec.a] Error 2
make[1]: Leaving directory `/home/gerben/src/mplayer/trunk-20070704'
make: *** [build-stamp] Error 2