Use 64bit java if detected plus update to detect if user downgrades/upgrades between from Java 64 to 32 (updating heap size), Added detection of java "Bitness"
Apply subs for FFmpeg
Updated the font size
Reverted unrelated file change
Formatting
Formatting
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer into subtitles2
Made some code general to use also in FFmpegWebVideo
Formatting
Merge branch 'subtitles' of github.com:UniversalMediaServer/UniversalMediaServer into subtitles2
Formatting
Rename and deprecate some methods used together in Mencoder and FFmpeg
Update CHANGELOG
Updated Dutch translation (thanks, leroy!)
Removed not used argument
Formatting
Removed unused argument
Fixed subs conversion
Fixed video scaler
Updated directory reference