aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2015-03-20 02:35:52 +0300
committerBoris Bobrov <breton@cynicmansion.ru>2015-03-20 02:35:52 +0300
commit4522ecef8065c44fab2804ae659812ba5d1e27dd (patch)
treee7557400a32146b6e052ae17aceeae5c36bdc58c
parentbd50f8bf701d3719b349523fa0822ed4958a9531 (diff)
downloadmediagoblin-4522ecef8065c44fab2804ae659812ba5d1e27dd.tar.lz
mediagoblin-4522ecef8065c44fab2804ae659812ba5d1e27dd.tar.xz
mediagoblin-4522ecef8065c44fab2804ae659812ba5d1e27dd.zip
Proper handling of tags in skip_transcode
The function to retrieve tags was used incorrectly in skip_transcode, assuming that str will be returned. Now the code is aware of the return format of the function. Closes bug 5065
-rw-r--r--mediagoblin/media_types/video/util.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/media_types/video/util.py b/mediagoblin/media_types/video/util.py
index 604702d7..d3d29279 100644
--- a/mediagoblin/media_types/video/util.py
+++ b/mediagoblin/media_types/video/util.py
@@ -34,24 +34,24 @@ def skip_transcode(metadata, size):
_log.debug('skip_transcode config: {0}'.format(config))
tags = metadata.get_tags()
- if config['mime_types'] and tags.get_string('mimetype'):
- if not tags.get_string('mimetype') in config['mime_types']:
+ if config['mime_types'] and tags.get_string('mimetype')[0]:
+ if not tags.get_string('mimetype')[1] in config['mime_types']:
return False
- if config['container_formats'] and tags.get_string('container-format'):
- if not (metadata.get_tags().get_string('container-format') in
+ if config['container_formats'] and tags.get_string('container-format')[0]:
+ if not (tags.get_string('container-format')[1] in
config['container_formats']):
return False
if config['video_codecs']:
for video_info in metadata.get_video_streams():
- if not (video_info.get_tags().get_string('video-codec') in
+ if not (video_info.get_tags().get_string('video-codec')[1] in
config['video_codecs']):
return False
if config['audio_codecs']:
for audio_info in metadata.get_audio_streams():
- if not (audio_info.get_tags().get_string('audio-codec') in
+ if not (audio_info.get_tags().get_string('audio-codec')[1] in
config['audio_codecs']):
return False