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
6 AC_CONFIG_HEADER(config.h)
7 -AM_GNU_GETTEXT([external])
13 AM_GNU_GETTEXT_VERSION(0.12.1)
16 --- cinelerra-cv-2.1/cinelerra/Makefile.am.org 2006-11-26 01:42:58.101122750 +0100
17 +++ cinelerra-cv-2.1/cinelerra/Makefile.am 2006-11-26 01:43:09.741850250 +0100
19 echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
21 else # (no repository)
22 - echo '#define REPOMAINTXT "(C) 2006 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
23 + echo '#define REPOMAINTXT "(C) 2006 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
24 echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
28 --- cinelerra/configure.in~ 2008-08-22 23:54:27.115850559 +0200
29 +++ cinelerra/configure.in 2008-08-22 23:58:19.452702168 +0200
31 PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
33 FFMPEG_EXTERNALTEXT="External ffmpeg"
34 + FFMPEG_CFLAGS="-I/usr/include/libavcodec"
37 FFMPEG_CFLAGS="-I\$(srcdir)/ffmpeg/libavcodec"
38 --- cinelerra-cv-2.1/cinelerra/playback3d.h~ 2006-11-26 00:41:51.000000000 +0100
39 +++ cinelerra-cv-2.1/cinelerra/playback3d.h 2008-08-23 00:02:01.015805393 +0200
41 // output - passed when rendering refresh frame. If 0, the canvas is cleared.
42 void clear_output(Canvas *canvas, VFrame *output);
44 - void do_fade(Canvas *canvas, VFrame *fade, float fade);
45 + void do_fade(Canvas *canvas, VFrame *fade, float fadex);
47 void do_mask(Canvas *canvas,
50 --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am 2008-08-23 14:53:19.959321239 +0000
51 +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org 2008-08-23 14:53:15.609327436 +0000
55 libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
56 +AM_LIBTOOLFLAGS=--tag=CC
58 libmpeg3_video_la_SOURCES +=
60 --- cinelerra-cv-2.1/mpeg2enc/Makefile.am~ 2008-08-23 16:56:56.992840914 +0200
61 +++ cinelerra-cv-2.1/mpeg2enc/Makefile.am 2008-08-23 17:00:05.433238449 +0200
63 libmpeg2enc_la_SOURCES += fdct_mmx.s fdctdata.c idct_mmx.s idctdata.c \
64 quant_mmx.s quantize_x86.c predict_mmx.s \
65 predcomp_mmxe.s predcomp_mmx.s
66 +AM_LIBTOOLFLAGS=--tag=CC
69 noinst_HEADERS = attributes.h \