mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 11:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
This reverts commit d027bf7401.
This commit is contained in:
Nicolas Dufresne 2018-11-06 06:02:34 -05:00
parent d027bf7401
commit 6bb5408f1b
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,7 +1,7 @@
*build*/ *build*/
gst-devtools gst-devtools
gst-editing-services gst-editing-services
gst-ffpeg gst-libav
gst-omx gst-omx
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base
@ -16,7 +16,7 @@ __pycache__
meson/ meson/
subprojects/gst-devtools/ subprojects/gst-devtools/
subprojects/gst-editing-services/ subprojects/gst-editing-services/
subprojects/gst-ffmpeg/ subprojects/gst-libav/
subprojects/gst-omx/ subprojects/gst-omx/
subprojects/gst-plugins-bad/ subprojects/gst-plugins-bad/
subprojects/gst-plugins-base/ subprojects/gst-plugins-base/

2
meson.build
View file

@ -39,7 +39,7 @@ subprojects = {
'pygobject': { 'option': get_option('python') }, 'pygobject': { 'option': get_option('python') },
'gst-python': { 'option': get_option('python') }, 'gst-python': { 'option': get_option('python') },
'gst-omx': { 'option': get_option('omx'), }, 'gst-omx': { 'option': get_option('omx'), },
'gst-ffmpeg': { 'option': get_option('ffmpeg') }, 'gst-libav': { 'option': get_option('libav') },
'gstreamer-vaapi': { 'option': get_option('vaapi') }, 'gstreamer-vaapi': { 'option': get_option('vaapi') },
'gst-devtools': { 'option': get_option('devtools') }, 'gst-devtools': { 'option': get_option('devtools') },
'gst-editing-services': { 'option': get_option('ges') }, 'gst-editing-services': { 'option': get_option('ges') },

2
meson_options.txt
View file

@ -1,5 +1,5 @@
option('python', type : 'feature', value : 'auto') 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('ugly', type : 'feature', value : 'auto')
option('bad', type : 'feature', value : 'auto') option('bad', type : 'feature', value : 'auto')
option('devtools', type : 'feature', value : 'auto') option('devtools', type : 'feature', value : 'auto')

5
subprojects/gst-ffmpeg.wrap
View file

@ -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

5
subprojects/gst-libav.wrap Normal file
View file

@ -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