1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
diff -aur work2/cinelerra-cvs-20051004/quicktime/Makefile.am work1/cinelerra-cvs-20051004/quicktime/Makefile.am
--- work2/cinelerra-cvs-20051005/quicktime/Makefile.am 2005-10-04 11:01:16.000000000 +0200
+++ work1/cinelerra-cvs-20051005/quicktime/Makefile.am 2005-10-04 11:45:43.000000000 +0200
@@ -22,7 +22,6 @@
-lfaac \
encore50/libencore.la \
$(top_builddir)/libmpeg3/libmpeg3hv.la \
- -lx264 \
-ldv -ljpeg -lpng \
-lz -lpthread -lm
@@ -56,7 +55,6 @@
plugin.c \
qtdv.c \
qtffmpeg.c \
- qth264.c \
qtpng.c \
qtmp3.c \
quicktime.c \
@@ -89,7 +87,6 @@
mpeg4.h \
qtdv.h \
qtffmpeg.h \
- qth264.h \
qtmp3.h \
qtpng.h \
qtprivate.h \
diff -aur work2/cinelerra-cvs-20051004/quicktime/ffmpeg/configure work1/cinelerra-cvs-20051004/quicktime/ffmpeg/configure
--- work2/cinelerra-cvs-20051005/quicktime/ffmpeg/configure 2005-10-04 11:01:15.000000000 +0200
+++ work1/cinelerra-cvs-20051005/quicktime/ffmpeg/configure 2005-10-04 11:52:05.000000000 +0200
@@ -483,8 +483,6 @@
;;
--enable-xvid) xvid="yes"
;;
- --enable-x264) x264="yes"; extralibs="$extralibs -lx264"
- ;;
--enable-dc1394) dc1394="yes"
;;
--disable-vhook) vhook="no"
@@ -1528,8 +1526,8 @@
fi
if test "$x264" = "yes" ; then
- echo "#define CONFIG_X264 1" >> $TMPH
- echo "CONFIG_X264=yes" >> config.mak
+ echo "#define CONFIG_X264 0" >> $TMPH
+ echo "CONFIG_X264=no" >> config.mak
fi
if test "$mingw32" = "yes" ; then
diff -aur work2/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/Makefile.am work1/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/Makefile.am
--- work2/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/Makefile.am 2005-10-04 11:01:16.000000000 +0200
+++ work1/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/Makefile.am 2005-10-04 11:53:02.000000000 +0200
@@ -136,8 +136,6 @@
libavcodec_la_LIBADD += -lfaac
#libavcodec_la_SOURCES += xvidff.c
#libavcodec_la_LIBADD += -lxvidcore
-libavcodec_la_SOURCES += x264.c
-libavcodec_la_LIBADD += -lx264
libavcodec_la_SOURCES += mp3lameaudio.c
libavcodec_la_LIBADD += -lmp3lame
libavcodec_la_SOURCES += oggvorbis.c
diff -aur work2/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/allcodecs.c work1/cinelerra-cvs-20051004/quicktime/ffmpeg/libavcodec/allcodecs.c
--- work2/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/allcodecs.c 2005-10-04 11:01:15.000000000 +0200
+++ work1/cinelerra-cvs-20051005/quicktime/ffmpeg/libavcodec/allcodecs.c 2005-10-04 11:55:01.000000000 +0200
@@ -181,6 +181,7 @@
#ifdef CONFIG_SONIC_LS_ENCODER
register_avcodec(&sonic_ls_encoder);
#endif //CONFIG_SONIC_LS_ENCODER
+#undef CONFIG_X264
#ifdef CONFIG_X264
#ifdef CONFIG_X264_ENCODER
register_avcodec(&x264_encoder);
diff -aur work2/cinelerra-cvs-20051004/quicktime/plugin.c work1/cinelerra-cvs-20051004/quicktime/plugin.c
--- work2/cinelerra-cvs-20051005/quicktime/plugin.c 2005-10-04 11:01:16.000000000 +0200
+++ work1/cinelerra-cvs-20051005/quicktime/plugin.c 2005-10-04 11:46:43.000000000 +0200
@@ -64,7 +64,6 @@
-#include "qth264.h"
#include "raw.h"
#include "qtdv.h"
#include "jpeg.h"
@@ -83,8 +82,6 @@
register_vcodec(quicktime_init_codec_raw);
- register_vcodec(quicktime_init_codec_h264);
- register_vcodec(quicktime_init_codec_hv64);
register_vcodec(quicktime_init_codec_divx);
register_vcodec(quicktime_init_codec_hv60);
register_vcodec(quicktime_init_codec_div5);
|
GitWeb