diff options
| -rw-r--r-- | backend/zmusic/endpoints/song.py | 2 | ||||
| -rw-r--r-- | frontend/js/controls/AudioPlayer.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backend/zmusic/endpoints/song.py b/backend/zmusic/endpoints/song.py index 3f6e5ff..6c153e9 100644 --- a/backend/zmusic/endpoints/song.py +++ b/backend/zmusic/endpoints/song.py @@ -36,7 +36,7 @@ def song(id, ext): if ext not in [ "ogg", "mp3", "flac", "wav", "webm" ]: return abort(404) - transcode_options = [ 'avconv', '-loglevel', 'quiet', '-i', song.filename, '-f', ext, '-y', '-fflags', 'nobuffer' ]; + transcode_options = [ 'ffmpeg', '-loglevel', 'quiet', '-i', song.filename, '-f', ext, '-y', '-fflags', 'nobuffer' ]; if ext == "ogg" or ext == "webm": transcode_options.extend([ '-acodec', 'libvorbis', '-aq', '5' ]) elif ext == "mp3": diff --git a/frontend/js/controls/AudioPlayer.js b/frontend/js/controls/AudioPlayer.js index 6cec14b..5711e2b 100644 --- a/frontend/js/controls/AudioPlayer.js +++ b/frontend/js/controls/AudioPlayer.js @@ -100,7 +100,7 @@ var AudioPlayer = function(controls) { AudioPlayer.prototype.setCollection = function(collection) { this.collection = collection; }; -AudioPlayer.preferredMimes = [ "audio/webm", "audio/ogg", "audio/mpeg", "audio/flac", "audio/wav" ] +AudioPlayer.preferredMimes = [ "audio/ogg", "audio/webm", "audio/mpeg", "audio/mp4", "audio/flac", "audio/wav" ] AudioPlayer.mimeMap = { "audio/webm": "webm", "audio/mp4": "m4a", "audio/wav": "wav", "audio/ogg": "ogg", "audio/x-ms-wma": "wma", "audio/flac": "flac", "audio/x-musepack": "mpc", "audio/mpeg": "mp3" }; |