aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/processing
diff options
context:
space:
mode:
authorJoar Wandborg <git@wandborg.com>2012-03-27 12:05:09 +0200
committerJoar Wandborg <git@wandborg.com>2012-03-27 12:05:09 +0200
commitdeea3f6661df68a62d56317915ca1e71240061d4 (patch)
tree6b7708610db3500f07f494519d57eec7a0799eee /mediagoblin/processing
parentd0cb752992ce6cea2b8581dead5481591ddbb82b (diff)
parentc56d4b55a169d67a3e5e5aba4271a67f0cb79c6f (diff)
downloadmediagoblin-deea3f6661df68a62d56317915ca1e71240061d4.tar.lz
mediagoblin-deea3f6661df68a62d56317915ca1e71240061d4.tar.xz
mediagoblin-deea3f6661df68a62d56317915ca1e71240061d4.zip
Merge remote-tracking branch 'joar/audio+sniffing'
Conflicts: mediagoblin/media_types/image/processing.py mediagoblin/media_types/video/__init__.py mediagoblin/media_types/video/processing.py mediagoblin/tests/test_submission.py
Diffstat (limited to 'mediagoblin/processing')
-rw-r--r--mediagoblin/processing/__init__.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/mediagoblin/processing/__init__.py b/mediagoblin/processing/__init__.py
index 9dee3baa..4a827af4 100644
--- a/mediagoblin/processing/__init__.py
+++ b/mediagoblin/processing/__init__.py
@@ -24,9 +24,6 @@ from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
_log = logging.getLogger(__name__)
-THUMB_SIZE = 180, 180
-MEDIUM_SIZE = 640, 640
-
def create_pub_filepath(entry, filename):
return mgg.public_store.get_unique_filepath(