Updated after gst-libav got moved to gst-ffmpeg

diff --git a/.gitignore b/.gitignore
index 9f6cec5..3d8dc27 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *build*/
 gst-devtools
 gst-editing-services
-gst-libav
+gst-ffpeg
 gst-omx
 gst-plugins-bad
 gst-plugins-base
@@ -16,7 +16,7 @@ __pycache__
 meson/
 subprojects/gst-devtools/
 subprojects/gst-editing-services/
-subprojects/gst-libav/
+subprojects/gst-ffmpeg/
 subprojects/gst-omx/
 subprojects/gst-plugins-bad/
 subprojects/gst-plugins-base/

diff --git a/meson.build b/meson.build
index 66dec30..a1e16df 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,7 @@ subprojects = {
     'pygobject': { 'option': get_option('python') },
     'gst-python': { 'option': get_option('python') },
     'gst-omx': { 'option': get_option('omx'), },
-    'gst-libav': { 'option': get_option('libav') },
+    'gst-ffmpeg': { 'option': get_option('ffmpeg') },
     'gstreamer-vaapi': { 'option': get_option('vaapi') },
     'gst-devtools': { 'option': get_option('devtools') },
     'gst-editing-services': { 'option': get_option('ges') },

diff --git a/meson_options.txt b/meson_options.txt
index be891a3..63b04a2 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option('python', type : 'feature', value : 'auto')
-option('libav', type : 'feature', value : 'auto')
+option('ffmpeg', type : 'feature', value : 'auto')
 option('ugly', type : 'feature', value : 'auto')
 option('bad', type : 'feature', value : 'auto')
 option('devtools', type : 'feature', value : 'auto')

diff --git a/subprojects/gst-ffmpeg.wrap b/subprojects/gst-ffmpeg.wrap
new file mode 100644 (file)
index 0000000..92db8ea
--- /dev/null
+++ b/subprojects/gst-ffmpeg.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=gst-ffmpeg
+url=https://gitlab.freedesktop.org/gstreamer/gst-ffmpeg.git
+push-url=git@gitlab.freedesktop.org:gstreamer/gst-ffmpeg.git
+revision=master

diff --git a/subprojects/gst-libav.wrap b/subprojects/gst-libav.wrap
deleted file mode 100644 (file)
index d011543..0000000
--- a/subprojects/gst-libav.wrap
+++ /dev/null
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=gst-libav
-url=https://gitlab.freedesktop.org/gstreamer/gst-libav.git
-push-url=git@gitlab.freedesktop.org:gstreamer/gst-libav.git
-revision=master