Including Pull Request 2597

Fix an issue with embedded mkv subtitles after the recent ffmpeg merge. 
Also go through all version checks and remove/update/comment them 
(should help libav and ffmpeg compatibility).

See: https://github.com/xbmc/xbmc/pull/2597