heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source 
- Added error handling for PyGTK import
- Added 'mkv' to the video media manager
This commit is contained in:
Joar Wandborg 2011-11-01 23:00:35 +01:00
parent 6cde0361c7
commit 315266b42f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/media_types/video/__init__.py
View File

@ -23,4 +23,4 @@ MEDIA_MANAGER = {
# 'mediagoblin.media_types.image.processing'? # 'mediagoblin.media_types.image.processing'?
"display_template": "mediagoblin/media_displays/video.html", "display_template": "mediagoblin/media_displays/video.html",
"default_thumb": "images/media_thumbs/video.jpg", "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"]}

5
mediagoblin/media_types/video/transcoders.py
View File

@ -29,7 +29,10 @@ _log = logging.getLogger(__name__)
logging.basicConfig() logging.basicConfig()
_log.setLevel(logging.DEBUG) _log.setLevel(logging.DEBUG)
import gtk try:
import gtk
except:
raise Exception('Could not find pygtk')
try: try:
import gobject import gobject