summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind <git@mazdermind.de>2015-09-27 16:37:54 +0200
committerMaZderMind <git@mazdermind.de>2015-09-27 16:37:54 +0200
commit9a5a91277efed7bf18966f2e8797d18b10bfbb6a (patch)
tree026d295d2048b9b4b30ce8ecafc13596b2a633f2
parent867b8be36b312881b458ec51ab0b2a9950512f4a (diff)
parentc11afb9995f452cb702ddef128f7e652f399bdbc (diff)
Merge remote-tracking branch 'nueces/master'
-rwxr-xr-xvoctocore/voctocore.py2
-rwxr-xr-xvoctogui/voctogui.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/voctocore/voctocore.py b/voctocore/voctocore.py
index 609ef52..aa5350d 100755
--- a/voctocore/voctocore.py
+++ b/voctocore/voctocore.py
@@ -9,6 +9,7 @@ from gi.repository import Gst, GObject
minGst = (1, 5)
minPy = (3, 0)
+Gst.init([])
if Gst.version() < minGst:
raise Exception("GStreamer version", Gst.version(), 'is too old, at least', minGst, 'is required')
@@ -18,7 +19,6 @@ if sys.version_info < minPy:
# init GObject & Co. before importing local classes
GObject.threads_init()
-Gst.init([])
# import local classes
from lib.args import Args
diff --git a/voctogui/voctogui.py b/voctogui/voctogui.py
index 703bb67..d37e168 100755
--- a/voctogui/voctogui.py
+++ b/voctogui/voctogui.py
@@ -9,6 +9,7 @@ from gi.repository import Gtk, Gdk, Gst, GObject, GdkX11, GstVideo
minGst = (1, 5)
minPy = (3, 0)
+Gst.init([])
if Gst.version() < minGst:
raise Exception("GStreamer version", Gst.version(), 'is too old, at least', minGst, 'is required')
@@ -20,7 +21,6 @@ if sys.version_info < minPy:
GObject.threads_init()
Gdk.init([])
Gtk.init([])
-Gst.init([])
# import local classes
from lib.args import Args