Merge pull request #4049 from elupus/srtfix
authorjmarshallnz <jcmarsha@gmail.com>
Mon, 10 Feb 2014 23:18:15 +0000 (12:18 +1300)
committerjmarshallnz <jcmarsha@gmail.com>
Mon, 10 Feb 2014 23:18:15 +0000 (12:18 +1300)
commit88426ad1f779e73876b03f0ebec0734bee69021a
tree7f23c609a9107238617194283fc628868a704f55
parent294972696f232dca7322cb7673a33da255aa1dd3
parent7570cdf0b3145e9b1af9f2c1ac8af8c232a75ebc
Merge pull request #4049 from elupus/srtfix

dvdplayer: make sure we restore output timestamps for text based subs
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/omxplayer/OMXPlayer.cpp