Fix FFmpeg audio selection
Fix for weird chars in subs
Fix for weird chars in subs
Formating
Remove .orig file
Formatting
FFMpeg audio selection - update
Formatting
FFMpeg audio selection - last update

I hope. Stream mapping is not necessary when there is only one audio
stream
Removed unused translation
Renamed FFmpegVideo back to FFMpegVideo for plugin compatibility
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Removed unsupported subtitle formats from FFmpeg
Bumped version to 2.4.0
Updated changelog
Remux MP4 files with 5.1 AAC audio to the PS3

Otherwise the PS3 outputs silence despite playing the video
Log NPE but don't let it stop the shutdown process