projects / vuplus_xbmc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2949726 7570cdf)
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)
dvdplayer: make sure we restore output timestamps for text based subs

1  2 
xbmc/cores/dvdplayer/DVDPlayer.cpp patch | diff1 | diff2 | blob | history
xbmc/cores/omxplayer/OMXPlayer.cpp patch | diff1 | diff2 | blob | history

diff --cc xbmc/cores/dvdplayer/DVDPlayer.cpp
Simple merge
diff --cc xbmc/cores/omxplayer/OMXPlayer.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.