Merge EXTVLCOPT and EXTINF updates from https://github.com/E2OpenPlugins/e2openplugin-OpenWebif/pull/197