1
Index: ffmpeg-0.cvs20060329/configure
1
Index: ffmpeg-0.cvs20060817/configure
2
2
===================================================================
3
--- ffmpeg-0.cvs20060329.orig/configure 2006-03-29 21:10:39.000000000 +0200
4
+++ ffmpeg-0.cvs20060329/configure 2006-03-29 21:10:44.000000000 +0200
5
@@ -1593,10 +1593,10 @@
3
--- ffmpeg-0.cvs20060817.orig/configure 2006-08-17 12:45:30.000000000 +0200
4
+++ ffmpeg-0.cvs20060817/configure 2006-08-17 12:49:18.000000000 +0200
5
@@ -1744,11 +1744,11 @@
6
6
echo "#define HAVE_VHOOK 1" >> $TMPH
9
-pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libavcodec/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
9
-sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
10
-pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
10
11
-lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
11
12
-lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
12
13
-lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
13
+pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libavcodec/libpostproc/postprocess.h" | sed 's/^[^0-9\.]*//'`
14
+lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/^[^0-9\.]*//'`
15
+lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/^[^0-9\.]*//'`
16
+lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/^[^0-9\.]*//'`
20
Index: ffmpeg-0.cvs20060329/libavutil/avutil.h
14
+sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]*//'`
15
+pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]*//'`
16
+lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]*//'`
17
+lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]*//'`
18
+lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]*//'`
22
Index: ffmpeg-0.cvs20060817/libavutil/avutil.h
21
23
===================================================================
22
--- ffmpeg-0.cvs20060329.orig/libavutil/avutil.h 2006-03-29 21:10:12.000000000 +0200
23
+++ ffmpeg-0.cvs20060329/libavutil/avutil.h 2006-03-29 21:10:44.000000000 +0200
24
--- ffmpeg-0.cvs20060817.orig/libavutil/avutil.h 2006-07-24 17:11:16.000000000 +0200
25
+++ ffmpeg-0.cvs20060817/libavutil/avutil.h 2006-08-17 12:47:42.000000000 +0200
25
27
#define AV_TOSTRING(s) #s
30
32
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
32
34
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
33
Index: ffmpeg-0.cvs20060329/libavcodec/avcodec.h
35
Index: ffmpeg-0.cvs20060817/libavcodec/avcodec.h
34
36
===================================================================
35
--- ffmpeg-0.cvs20060329.orig/libavcodec/avcodec.h 2006-03-29 21:10:12.000000000 +0200
36
+++ ffmpeg-0.cvs20060329/libavcodec/avcodec.h 2006-03-29 21:10:44.000000000 +0200
37
--- ffmpeg-0.cvs20060817.orig/libavcodec/avcodec.h 2006-08-17 12:39:27.000000000 +0200
38
+++ ffmpeg-0.cvs20060817/libavcodec/avcodec.h 2006-08-17 12:49:57.000000000 +0200
38
40
#define AV_TOSTRING(s) #s
40
#define LIBAVCODEC_VERSION_INT ((51<<16)+(8<<8)+0)
41
-#define LIBAVCODEC_VERSION 51.8.0
42
+#define LIBAVCODEC_VERSION 0d.51.8.0
42
#define LIBAVCODEC_VERSION_INT ((51<<16)+(11<<8)+0)
43
-#define LIBAVCODEC_VERSION 51.11.0
44
+#define LIBAVCODEC_VERSION 0d.51.11.0
43
45
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
45
47
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
46
Index: ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess.h
47
===================================================================
48
--- ffmpeg-0.cvs20060329.orig/libavcodec/libpostproc/postprocess.h 2006-03-29 21:10:12.000000000 +0200
49
+++ ffmpeg-0.cvs20060329/libavcodec/libpostproc/postprocess.h 2006-03-29 21:10:44.000000000 +0200
48
Index: ffmpeg-0.cvs20060817/libavformat/avformat.h
49
===================================================================
50
--- ffmpeg-0.cvs20060817.orig/libavformat/avformat.h 2006-08-17 12:39:28.000000000 +0200
51
+++ ffmpeg-0.cvs20060817/libavformat/avformat.h 2006-08-17 12:47:42.000000000 +0200
55
#define LIBAVFORMAT_VERSION_INT ((50<<16)+(5<<8)+0)
56
-#define LIBAVFORMAT_VERSION 50.5.0
57
+#define LIBAVFORMAT_VERSION 0d.50.5.0
58
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
60
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
61
Index: ffmpeg-0.cvs20060817/common.mak
62
===================================================================
63
--- ffmpeg-0.cvs20060817.orig/common.mak 2006-08-17 12:39:28.000000000 +0200
64
+++ ffmpeg-0.cvs20060817/common.mak 2006-08-17 12:50:26.000000000 +0200
67
ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
69
- ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
70
+ ln -sf $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
72
install-lib-static: $(LIB)
73
install -d "$(libdir)"
74
Index: ffmpeg-0.cvs20060817/libpostproc/postprocess.h
75
===================================================================
76
--- ffmpeg-0.cvs20060817.orig/libpostproc/postprocess.h 2006-06-11 14:17:36.000000000 +0200
77
+++ ffmpeg-0.cvs20060817/libpostproc/postprocess.h 2006-08-17 12:47:42.000000000 +0200
56
84
#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
58
86
#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
59
Index: ffmpeg-0.cvs20060329/libavformat/avformat.h
60
===================================================================
61
--- ffmpeg-0.cvs20060329.orig/libavformat/avformat.h 2006-03-29 21:10:12.000000000 +0200
62
+++ ffmpeg-0.cvs20060329/libavformat/avformat.h 2006-03-29 21:10:44.000000000 +0200
66
#define LIBAVFORMAT_VERSION_INT ((50<<16)+(4<<8)+0)
67
-#define LIBAVFORMAT_VERSION 50.4.0
68
+#define LIBAVFORMAT_VERSION 0d.50.4.0
69
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
71
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
72
Index: ffmpeg-0.cvs20060329/common.mak
73
===================================================================
74
--- ffmpeg-0.cvs20060329.orig/common.mak 2006-03-29 21:10:12.000000000 +0200
75
+++ ffmpeg-0.cvs20060329/common.mak 2006-03-29 21:10:44.000000000 +0200
77
$(libdir)/$(SLIBNAME_WITH_VERSION)
78
ln -sf $(SLIBNAME_WITH_VERSION) \
79
$(libdir)/$(SLIBNAME_WITH_MAJOR)
80
- ln -sf $(SLIBNAME_WITH_VERSION) \
81
+ ln -sf $(SLIBNAME_WITH_MAJOR) \