aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/media_types
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-07-31 19:15:20 +0530
committerAditi <aditi.iitr@gmail.com>2013-07-31 19:15:20 +0530
commitaf2f28033be564af0609cfac54c9ae3dbe2cdb42 (patch)
tree252bb7d5da4f0b8fd3a3adb208322d21d85e0a78 /mediagoblin/media_types
parentef010b6453d1a4152abe6869b0b019ee1fb3dc6b (diff)
parenta1e299d60e135905e39358fe5dc1efcd64172daf (diff)
downloadmediagoblin-af2f28033be564af0609cfac54c9ae3dbe2cdb42.tar.lz
mediagoblin-af2f28033be564af0609cfac54c9ae3dbe2cdb42.tar.xz
mediagoblin-af2f28033be564af0609cfac54c9ae3dbe2cdb42.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r--mediagoblin/media_types/audio/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mediagoblin/media_types/audio/__init__.py b/mediagoblin/media_types/audio/__init__.py
index 90f842ba..c7ed8d2d 100644
--- a/mediagoblin/media_types/audio/__init__.py
+++ b/mediagoblin/media_types/audio/__init__.py
@@ -19,6 +19,9 @@ from mediagoblin.media_types.audio.processing import process_audio, \
sniff_handler
from mediagoblin.tools import pluginapi
+# Why isn't .ogg in this list? It's still detected, but via sniffing,
+# .ogg files could be either video or audio... sniffing determines which.
+
ACCEPTED_EXTENSIONS = ["mp3", "flac", "wav", "m4a"]
MEDIA_TYPE = 'mediagoblin.media_types.audio'