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
21 GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi)
22 - echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
23 + echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
24 echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h
28 SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi)
29 - echo '#define REPOMAINTXT " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
30 + echo '#define REPOMAINTXT " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
31 echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
36 - echo '#define REPOMAINTXT " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
37 + echo '#define REPOMAINTXT " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
38 echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h
41 else # (no repository)
44 - echo '#define REPOMAINTXT "(C) 2006 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
45 + echo '#define REPOMAINTXT "(C) 2006 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
46 echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
49 --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am 2008-08-23 14:53:19.959321239 +0000
50 +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org 2008-08-23 14:53:15.609327436 +0000
54 libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
55 +AM_LIBTOOLFLAGS=--tag=CC
57 libmpeg3_video_la_SOURCES +=
59 --- cinelerra-cv-2.1/mpeg2enc/Makefile.am~ 2008-08-23 16:56:56.992840914 +0200
60 +++ cinelerra-cv-2.1/mpeg2enc/Makefile.am 2008-08-23 17:00:05.433238449 +0200
62 libmpeg2enc_la_SOURCES += fdct_mmx.s fdctdata.c idct_mmx.s idctdata.c \
63 quant_mmx.s quantize_x86.c predict_mmx.s \
64 predcomp_mmxe.s predcomp_mmx.s
65 +AM_LIBTOOLFLAGS=--tag=CC
68 noinst_HEADERS = attributes.h \
69 --- cv/configure.in.org 2008-10-27 10:15:06.091895546 +0100
70 +++ cv/configure.in 2008-10-27 10:15:21.304615704 +0100
72 dnl if not, that means that libswscale is compiled in
74 AC_MSG_CHECKING(for ffmpeg swscale support)
76 - LIBS="$saved_LIBS $FFMPEG_TEMP_LIBS"
77 - AC_TRY_LINK([#include <libavcodec/avcodec.h>],
78 - [img_convert(0, 0, 0,0,0,0)],
79 - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes)
81 + enable_ffmpeg_swscale=yes
82 AC_MSG_RESULT($enable_ffmpeg_swscale)
83 if test x"$enable_ffmpeg_swscale" = xyes; then
84 dnl AC_DEFINE(HAVE_SWSCALER)
85 --- cv/cinelerra/ffmpeg.C.org 2008-10-27 10:26:46.890782761 +0100
86 +++ cv/cinelerra/ffmpeg.C 2008-10-27 10:27:19.937445860 +0100
95 --- cinelerra-cv/cinelerra/edits.C~ 2010-01-09 15:12:19.000000000 +0100
96 +++ cinelerra-cv/cinelerra/edits.C 2010-04-26 09:13:43.381588613 +0200
101 - List<Edit>::List<Edit>();
102 default_edit->edl = edl;
103 default_edit->track = track;
104 default_edit->startproject = 0;