Revert "Updated after gst-libav got moved to gst-ffmpeg"

This reverts commit d027bf74011381a699ae59e3e95df3630cc73cfb.

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

diff --git a/meson.build b/meson.build
index a1e16dfc3f88f5467382e644c39a9277b4e3e5b3..66dec30328b9a4c5440bf7aa56efd834f549e2c5 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-ffmpeg': { 'option': get_option('ffmpeg') },
+    'gst-libav': { 'option': get_option('libav') },
     '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 63b04a27b3638a6fd39695bc747519610474cd73..be891a3b623546914840b52e1d89c7a7adb48584 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
 option('python', type : 'feature', value : 'auto')
-option('ffmpeg', type : 'feature', value : 'auto')
+option('libav', 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
deleted file mode 100644 (file)
index 92db8ea..0000000
--- a/subprojects/gst-ffmpeg.wrap
+++ /dev/null
@@ -1,5 +0,0 @@
-[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
new file mode 100644 (file)
index 0000000..d011543
--- /dev/null
+++ b/subprojects/gst-libav.wrap
@@ -0,0 +1,5 @@
+[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