xbmc/xbmc — pull request #1992 by GreenOnyx (2012-12-27 06:25:17+00:00)
Title: Fixed forced subtitles display in PGS stream

Resubmitting due to added changes to bring things more in line with current ffmpeg code and prevent the need for a patch. This should match the current ffmpeg code minus other commits that will be rolled in down the road. Any future ffmpeg commits/updates should match or be able to overwrite this.