Merge branch 'master' of github.com:MPExtended/MPExtended
WSS: Update ffmpeg to 2.0.1 and fix HLS profiles for compatibility

This fixes HLS streaming profiles on the ffmpeg profiles.