diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-11-01 23:00:35 +0100 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-11-01 23:00:35 +0100 |
| commit | 315266b42f90c610f464c4ce773f1feb83620a56 (patch) | |
| tree | 7e80491b41499d19a0f0d277362f269ff9365e09 | |
| parent | 6cde0361c76618b1673b2c9800d35f19c63ace51 (diff) | |
| download | mediagoblin-315266b42f90c610f464c4ce773f1feb83620a56.tar.lz mediagoblin-315266b42f90c610f464c4ce773f1feb83620a56.tar.xz mediagoblin-315266b42f90c610f464c4ce773f1feb83620a56.zip | |
Minor fixes
- Added error handling for PyGTK import
- Added 'mkv' to the video media manager
| -rw-r--r-- | mediagoblin/media_types/video/__init__.py | 2 | ||||
| -rw-r--r-- | mediagoblin/media_types/video/transcoders.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py index 2a36623e..c1910ee2 100644 --- a/mediagoblin/media_types/video/__init__.py +++ b/mediagoblin/media_types/video/__init__.py @@ -23,4 +23,4 @@ MEDIA_MANAGER = { # 'mediagoblin.media_types.image.processing'? "display_template": "mediagoblin/media_displays/video.html", "default_thumb": "images/media_thumbs/video.jpg", - "accepted_extensions": ["mp4", "mov", "webm", "avi", "3gp", "3gpp"]} + "accepted_extensions": ["mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "ogg"]} diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py index dfb0899e..512c7cb6 100644 --- a/mediagoblin/media_types/video/transcoders.py +++ b/mediagoblin/media_types/video/transcoders.py @@ -29,7 +29,10 @@ _log = logging.getLogger(__name__) logging.basicConfig() _log.setLevel(logging.DEBUG) -import gtk +try: + import gtk +except: + raise Exception('Could not find pygtk') try: import gobject |