merge with trunk (elupus's subtitle fixes). revision 12949.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 11 May 2008 17:56:08 +0000 (17:56 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 11 May 2008 17:56:08 +0000 (17:56 +0000)
commit48fb671eeecd395595c6a9d3d807aadd1317fd27
tree811689bff12633aa12053ae1239066414b44a3f1
parentbce0e793bba34018c4f1aa72b37714aa9bab8cb3
Merge ... trunk (elupus's subtitle fixes). revision 12949.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport@12950 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp