Merge branch 'dev' into crem2

Parisson · Jan 15, 2015 · 2bedb58 · 2bedb58
2 parents 83e276b + 98c454f
commit 2bedb58
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/telemeta/models/media.py b/telemeta/models/media.py
@@ -648,7 +648,7 @@ def to_dict_with_more(self):
             metadata['identifier_notes' + '_' + str(i)] = identifier.notes
             i += 1
 
-        analyzers = ['channels', 'samplerate', 'duration', 'resolution', 'mimetype']
+        analyzers = ['channels', 'samplerate', 'duration', 'resolution', 'mime_type']
         for analyzer_id in analyzers:
             analysis = MediaItemAnalysis.objects.filter(item=self, analyzer_id=analyzer_id)
             if analysis: