Merge remote-tracking branch 'joar/audio+sniffing'

[mediagoblin.git] / mediagoblin / media_types / video / __init__.py

diff --git a/mediagoblin/media_types/video/__init__.py b/mediagoblin/media_types/video/__init__.py
index 579fdc6a64c372641940918466293ee86b4e7854..3faa5b9fad70e7a78b81cfe243836699ddd2fa77 100644 (file)
--- a/mediagoblin/media_types/video/__init__.py
+++ b/mediagoblin/media_types/video/__init__.py
@@ -14,16 +14,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from mediagoblin.media_types.video.processing import process_video
+from mediagoblin.media_types.video.processing import process_video, \
+    sniff_handler
 
 
 MEDIA_MANAGER = {
     "human_readable": "Video",
-    "processor": process_video, # alternately a string,
-                                # 'mediagoblin.media_types.image.processing'?
+    "processor": process_video,  # alternately a string,
+                                 # 'mediagoblin.media_types.image.processing'?
+    "sniff_handler": sniff_handler,
     "display_template": "mediagoblin/media_displays/video.html",
     "default_thumb": "images/media_thumbs/video.jpg",
-    # TODO: This list should be autogenerated based on gst plugins
     "accepted_extensions": [
-        "mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "ogg",
-        "m4v"]}
+        "mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "m4v"]}