From 52882ef9384bb69d06c626526f757ef1b3905f91 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 13 Sep 2012 10:35:13 -0400 Subject: [PATCH] Added mp4 removed aac. --- airtime_mvc/public/js/airtime/library/plupload.js | 2 +- python_apps/media-monitor2/media/monitor/pure.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js index 28190f3ef..a68196d0e 100644 --- a/airtime_mvc/public/js/airtime/library/plupload.js +++ b/airtime_mvc/public/js/airtime/library/plupload.js @@ -9,7 +9,7 @@ $(document).ready(function() { unique_names : 'true', multiple_queues : 'true', filters : [ - {title: "Audio Files", extensions: "ogg,mp3,oga,flac,aac,wav,m4a"} + {title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4"} ] }); diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 103902001..5a0cf9b90 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -20,8 +20,8 @@ from configobj import ConfigObj from media.monitor.exceptions import FailedToSetLocale, FailedToCreateDir #supported_extensions = [u"mp3", u"ogg", u"oga"] -supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"aac", u"wav", - u'm4a'] +supported_extensions = [u"mp3", u"ogg", u"oga", u"flac", u"wav", + u'm4a', u'mp4'] unicode_unknown = u'unknown'