Update string to time value conversion
Made MEncoder and FFmpeg videos more compatible when outputting H.264 by applying better maximum bitrate constraints
Formatting
Fixed maximum H.264 bitrate in FFmpeg
Added VLC todo
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
Formatting
Update external subs streaming
Formatting
Reverted 150138a
Disable AviSynth/MEncoder by default

It doesn't have the stability of the other video engines and is more for video enthusiasts anyway so they can enable it if they want
Sync UMS.conf default engines string with the one the program uses
Updated changelog
Update external subs streaming - 2nd try
Updated to fit commit 224f1fb2c7
Formatting
Merge pull request #146 from AlfredoRamos/patch-1

Updated to fit commit 224f1fb2c7
Tweak maximum bitrate calculation a bit more
Updated changelog
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer