1 --- cinelerra-cv-2.1/configure.in.org 2006-11-26 03:33:50.056844000 +0100
2 +++ cinelerra-cv-2.1/configure.in 2006-11-26 03:33:55.053156250 +0100
4 LIBS=`echo "$LIBS" | sed -e s/-lasound//g`
7 -if test "x$enable_esd" = "xyes"; then
8 - AM_PATH_ESD(,[esound=yes])
9 - if test "x$esound" = xyes; then
10 - SOUND_CFLAGS="$ESD_CFLAGS -DHAVE_ESOUND $SOUND_CFLAGS"
11 - SOUND_LDFLAGS="$ESD_LIBS $SOUND_LDFLAGS"
15 AC_SUBST(SOUND_CFLAGS)
16 AC_SUBST(SOUND_LDFLAGS)
17 ############### END OF SOUND
18 --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am 2008-08-23 14:53:19.959321239 +0000
19 +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org 2008-08-23 14:53:15.609327436 +0000
23 libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
24 +AM_LIBTOOLFLAGS=--tag=CC
26 libmpeg3_video_la_SOURCES +=
28 --- cinelerra-cv-2.1/mpeg2enc/Makefile.am~ 2008-08-23 16:56:56.992840914 +0200
29 +++ cinelerra-cv-2.1/mpeg2enc/Makefile.am 2008-08-23 17:00:05.433238449 +0200
31 libmpeg2enc_la_SOURCES += fdct_mmx.s fdctdata.c idct_mmx.s idctdata.c \
32 quant_mmx.s quantize_x86.c predict_mmx.s \
33 predcomp_mmxe.s predcomp_mmx.s
34 +AM_LIBTOOLFLAGS=--tag=CC
37 noinst_HEADERS = attributes.h \
38 --- cv/configure.in.org 2008-10-27 10:15:06.091895546 +0100
39 +++ cv/configure.in 2008-10-27 10:15:21.304615704 +0100
41 dnl if not, that means that libswscale is compiled in
43 AC_MSG_CHECKING(for ffmpeg swscale support)
45 - LIBS="$saved_LIBS $FFMPEG_TEMP_LIBS"
46 - AC_TRY_LINK([#include <libavcodec/avcodec.h>],
47 - [img_convert(0, 0, 0,0,0,0)],
48 - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes)
50 + enable_ffmpeg_swscale=yes
51 AC_MSG_RESULT($enable_ffmpeg_swscale)
52 if test x"$enable_ffmpeg_swscale" = xyes; then
53 dnl AC_DEFINE(HAVE_SWSCALER)
54 --- cv/cinelerra/ffmpeg.C.org 2008-10-27 10:26:46.890782761 +0100
55 +++ cv/cinelerra/ffmpeg.C 2008-10-27 10:27:19.937445860 +0100
64 --- cinelerra-cv/plugins/svg/svg.C~ 2010-01-09 15:12:21.000000000 +0100
65 +++ cinelerra-cv/plugins/svg/svg.C 2010-06-03 17:56:46.125079418 +0200
70 +#include <sys/types.h>
71 +#include <sys/stat.h>