Better error handling, add support for mp3/ogg-vorbis

This commit is contained in:
Calvin Montgomery 2014-06-05 21:58:26 -07:00
parent 1d1630fb50
commit 6dde745784
6 changed files with 69 additions and 26 deletions

View file

@ -885,7 +885,8 @@ PlaylistModule.prototype._addItem = function (media, data, user, cb) {
}
/* Warn about possibly unsupported formats */
if (media.type === "fi" && media.meta.codec !== "mov/h264" &&
if (media.type === "fi" && media.meta.codec.indexOf("/") !== -1 &&
media.meta.codec !== "mov/h264" &&
media.meta.codec !== "flv/h264") {
user.socket.emit("queueWarn", {
msg: "The codec <code>" + media.meta.codec + "</code> is not supported " +