Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
This commit is contained in:
commit
af2f28033b
@ -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'
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
import itsdangerous
|
||||
import logging
|
||||
|
||||
import crypto
|
||||
from mediagoblin.tools import crypto
|
||||
|
||||
_log = logging.getLogger(__name__)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user