diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-11-06 06:02:34 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-11-06 06:02:34 -0500 |
| commit | 6bb5408f1b70ea0ccf003396ba0702bdc9c102b5 (patch) | |
| tree | 023159b2d46c0f88dba1b02c7902d8cb71e167d8 | |
| parent | d027bf74011381a699ae59e3e95df3630cc73cfb (diff) | |
| download | gstreamer-6bb5408f1b70ea0ccf003396ba0702bdc9c102b5.tar.gz | |
Revert "Updated after gst-libav got moved to gst-ffmpeg"
This reverts commit d027bf74011381a699ae59e3e95df3630cc73cfb.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rw-r--r-- | subprojects/gst-ffmpeg.wrap | 5 | ||||
| -rw-r--r-- | subprojects/gst-libav.wrap | 5 |
5 files changed, 9 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 3d8dc276bd..9f6cec5a2a 100644 --- 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 a1e16dfc3f..66dec30328 100644 --- 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 63b04a27b3..be891a3b62 100644 --- 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 index 92db8ea529..0000000000 --- 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 index 0000000000..d01154348a --- /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 |