Don't mux strange colorspaces
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Use level 3.1 for H.264 encoding via FFmpeg
Differentiate between the Low Complexity and High Efficiency variants of Advanced Audio Coding

This fixes #155