summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--libavcodec/libavcodec.v8
-rw-r--r--libavdevice/libavdevice.v8
-rw-r--r--libavfilter/libavfilter.v9
-rw-r--r--libavformat/libavformat.v8
-rw-r--r--libavresample/libavresample.v8
-rw-r--r--libavutil/libavutil.v8
-rw-r--r--libswscale/libswscale.v9
8 files changed, 38 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index 8e0cfce..d90d9be 100644
--- a/Makefile
+++ b/Makefile
@@ -63,9 +63,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(Q)echo '#include "$*.h"' >$@
%.ver: %.v
- $(M)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ | sed -e 's/:/:\
-/' -e 's/; /;\
-/g' > $@
+ $(M)sed 's/MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@
%.c %.h %.ver: TAG = GEN
diff --git a/libavcodec/libavcodec.v b/libavcodec/libavcodec.v
index bf14807..f1d5e5b 100644
--- a/libavcodec/libavcodec.v
+++ b/libavcodec/libavcodec.v
@@ -1,4 +1,6 @@
-LIBAVCODEC_$MAJOR {
- global: av*;
- local: *;
+LIBAVCODEC_MAJOR {
+ global:
+ av*;
+ local:
+ *;
};
diff --git a/libavdevice/libavdevice.v b/libavdevice/libavdevice.v
index 663af85..33042e5 100644
--- a/libavdevice/libavdevice.v
+++ b/libavdevice/libavdevice.v
@@ -1,4 +1,6 @@
-LIBAVDEVICE_$MAJOR {
- global: avdevice_*;
- local: *;
+LIBAVDEVICE_MAJOR {
+ global:
+ avdevice_*;
+ local:
+ *;
};
diff --git a/libavfilter/libavfilter.v b/libavfilter/libavfilter.v
index 83e8887..6518e5f 100644
--- a/libavfilter/libavfilter.v
+++ b/libavfilter/libavfilter.v
@@ -1,4 +1,7 @@
-LIBAVFILTER_$MAJOR {
- global: avfilter_*; av_*;
- local: *;
+LIBAVFILTER_MAJOR {
+ global:
+ avfilter_*;
+ av_*;
+ local:
+ *;
};
diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index 6f11d60..47d5ddc 100644
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@@ -1,4 +1,6 @@
-LIBAVFORMAT_$MAJOR {
- global: av*;
- local: *;
+LIBAVFORMAT_MAJOR {
+ global:
+ av*;
+ local:
+ *;
};
diff --git a/libavresample/libavresample.v b/libavresample/libavresample.v
index b8c7c7d..d6fc751 100644
--- a/libavresample/libavresample.v
+++ b/libavresample/libavresample.v
@@ -1,4 +1,6 @@
-LIBAVRESAMPLE_$MAJOR {
- global: av*;
- local: *;
+LIBAVRESAMPLE_MAJOR {
+ global:
+ av*;
+ local:
+ *;
};
diff --git a/libavutil/libavutil.v b/libavutil/libavutil.v
index e9f04cb..fb17058 100644
--- a/libavutil/libavutil.v
+++ b/libavutil/libavutil.v
@@ -1,4 +1,6 @@
-LIBAVUTIL_$MAJOR {
- global: av*;
- local: *;
+LIBAVUTIL_MAJOR {
+ global:
+ av*;
+ local:
+ *;
};
diff --git a/libswscale/libswscale.v b/libswscale/libswscale.v
index 8b9a96a..96170a1 100644
--- a/libswscale/libswscale.v
+++ b/libswscale/libswscale.v
@@ -1,4 +1,7 @@
-LIBSWSCALE_$MAJOR {
- global: swscale_*; sws_*;
- local: *;
+LIBSWSCALE_MAJOR {
+ global:
+ swscale_*;
+ sws_*;
+ local:
+ *;
};
OpenPOWER on IntegriCloud