Dist compositor crossfade example and pythons script for meson build

And add to autotools build so it gets disted.

diff --git a/.gitignore b/.gitignore
index 26e2eeb..3a195fb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -61,6 +61,7 @@ gst*orc.h
 /tests/examples/ipcpipeline/ipcpipeline1
 /tests/examples/codecparsers/parse-jpeg
 /tests/examples/codecparsers/parse-vp8
+/tests/examples/compositor/crossfade
 /tests/examples/shapewipe/shapewipe-example
 /tests/examples/jack/jack_client
 /tests/examples/opencv/gstmotioncells_dynamic_test

diff --git a/Makefile.am b/Makefile.am
index 08d3ebe..ba35588 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST = \
        meson_options.txt \
        gst-libs/gst/interfaces/build_mkenum.py \
        gst-libs/gst/mpegts/mpegts_enum.py \
+       gst-libs/gst/webrtc/webrtc_mkenum.py \
        ext/srtp/srtp_mkenum.py \
        ext/vulkan/vkconfig.h.meson
 

diff --git a/configure.ac b/configure.ac
index 96aed92..f04eb9e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2599,6 +2599,7 @@ tests/examples/Makefile
 tests/examples/avsamplesink/Makefile
 tests/examples/camerabin2/Makefile
 tests/examples/codecparsers/Makefile
+tests/examples/compositor/Makefile
 tests/examples/directfb/Makefile
 tests/examples/audiomixmatrix/Makefile
 tests/examples/ipcpipeline/Makefile

diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index d11331e..68f3412 100644 (file)
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -58,10 +58,10 @@ playout_SOURCES = playout.c
 playout_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 playout_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS)
 
-SUBDIRS= codecparsers mpegts $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) \
+SUBDIRS= codecparsers compositor mpegts $(DIRECTFB_DIR) $(GTK_EXAMPLES) $(OPENCV_EXAMPLES) \
         $(AVSAMPLE_DIR) $(WAYLAND_DIR) $(MATRIXMIX_DIR) \
         $(IPCPIPELINE_DIR) $(WEBRTC_DIR)
-DIST_SUBDIRS= codecparsers mpegts camerabin2 directfb mxf opencv uvch264 \
+DIST_SUBDIRS= codecparsers compositor mpegts camerabin2 directfb mxf opencv uvch264 \
         avsamplesink waylandsink audiomixmatrix ipcpipeline webrtc
 
 include $(top_srcdir)/common/parallel-subdirs.mak

diff --git a/tests/examples/compositor/Makefile.am b/tests/examples/compositor/Makefile.am
new file mode 100644 (file)
index 0000000..2099130
--- /dev/null
+++ b/tests/examples/compositor/Makefile.am
@@ -0,0 +1,5 @@
+noinst_PROGRAMS = crossfade
+
+crossfade_SOURCES = crossfade.c
+crossfade_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+crossfade_LDADD = $(GST_PLUGINS_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS)

diff --git a/tests/examples/compositor/crossfade.c b/tests/examples/compositor/crossfade.c
index ea2bb42..44090ff 100644 (file)
--- a/tests/examples/compositor/crossfade.c
+++ b/tests/examples/compositor/crossfade.c
@@ -37,7 +37,7 @@ typedef struct
   gboolean is_last;
 } VideoInfo;
 
-gchar *
+static gchar *
 ensure_uri (const gchar * location)
 {
   if (gst_uri_is_valid (location))