diff options
| author | Boris Bobrov <breton@cynicmansion.ru> | 2015-12-21 02:46:24 +0300 |
|---|---|---|
| committer | Boris Bobrov <breton@cynicmansion.ru> | 2015-12-21 02:46:24 +0300 |
| commit | 63053f8c6608501832dbc9d9ab34d45a12204a11 (patch) | |
| tree | b560707b909ad626ab1a7fddde5005f82d5396b5 /mediagoblin | |
| parent | f58fac095048c28b38096410e7b8f59cf75e26b8 (diff) | |
| parent | 355d062dd4e35409af92e136666baf211161b7cb (diff) | |
| download | mediagoblin-63053f8c6608501832dbc9d9ab34d45a12204a11.tar.lz mediagoblin-63053f8c6608501832dbc9d9ab34d45a12204a11.tar.xz mediagoblin-63053f8c6608501832dbc9d9ab34d45a12204a11.zip | |
Merge branch 'stable'
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/media_types/tools.py | 4 | ||||
| -rw-r--r-- | mediagoblin/media_types/video/transcoders.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/media_types/tools.py b/mediagoblin/media_types/tools.py index 3bc56e2c..602b9605 100644 --- a/mediagoblin/media_types/tools.py +++ b/mediagoblin/media_types/tools.py @@ -35,8 +35,10 @@ def discover(src): # import, or an exception will be raised. import gi gi.require_version('Gst', '1.0') - from gi.repository import GObject, Gst, GstPbutils, GLib + from gi.repository import GObject, Gst, GLib Gst.init(None) + # init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260 + from gi.repository import GstPbutils _log.info('Discovering {0}...'.format(src)) uri = 'file://{0}'.format(src) diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py index f8020497..f4b0341e 100644 --- a/mediagoblin/media_types/video/transcoders.py +++ b/mediagoblin/media_types/video/transcoders.py @@ -31,8 +31,10 @@ sys.argv = [] import gi gi.require_version('Gst', '1.0') -from gi.repository import GObject, Gst, GstPbutils +from gi.repository import GObject, Gst Gst.init(None) +# init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260 +from gi.repository import GstPbutils sys.argv = old_argv import struct |