diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-03-05 16:49:06 -0600 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2015-03-05 16:49:06 -0600 |
commit | 50f12414df260de9605489ec0ca5427cff0813bf (patch) | |
tree | d4d21fbd8b5de4e91599b1b23d1d7dfd549d7f09 /mediagoblin/media_types | |
parent | 2d0511c49991118aedaffbaae19954ab03469cca (diff) | |
parent | 2b4c339de6a5762c59054182034793e3b6002ee4 (diff) | |
download | mediagoblin-50f12414df260de9605489ec0ca5427cff0813bf.tar.lz mediagoblin-50f12414df260de9605489ec0ca5427cff0813bf.tar.xz mediagoblin-50f12414df260de9605489ec0ca5427cff0813bf.zip |
Merge remote-tracking branch 'refs/remotes/breton/bug/647'
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r-- | mediagoblin/media_types/tools.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mediagoblin/media_types/tools.py b/mediagoblin/media_types/tools.py index c3b3a3f0..3bc56e2c 100644 --- a/mediagoblin/media_types/tools.py +++ b/mediagoblin/media_types/tools.py @@ -17,11 +17,6 @@ import logging from mediagoblin import mg_globals -import gi -gi.require_version('Gst', '1.0') -from gi.repository import GObject, Gst, GstPbutils, GLib -Gst.init(None) - _log = logging.getLogger(__name__) @@ -36,6 +31,13 @@ def discover(src): ''' Discover properties about a media file ''' + # GStreamer might be not installed, so it should not be initialized on + # import, or an exception will be raised. + import gi + gi.require_version('Gst', '1.0') + from gi.repository import GObject, Gst, GstPbutils, GLib + Gst.init(None) + _log.info('Discovering {0}...'.format(src)) uri = 'file://{0}'.format(src) discoverer = GstPbutils.Discoverer.new(60 * Gst.SECOND) |