Fix AviSyntplayer to not catch web with subs
Merge branch 'master' of github.com:UniversalMediaServer/UniversalMediaServer
FFmpeg refactoring to meet the FFmpeg API recommendations to be
compatible with plugins