diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-05-18 13:04:48 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-05-18 13:04:48 +0200 |
| commit | bb5f0ca0ff2cbf1f3a24aed6e79900484fe2d947 (patch) | |
| tree | 0c6b4bb21dfe37523685457b5080e33ed404b9be | |
| parent | d5970b8c1902be37d6de069b2845c3f3b50376e8 (diff) | |
| parent | 305b2e78dcf4198c54707ddacefe6eefd15ee6e2 (diff) | |
Merge pull request #7158 from FernetMenta/ffrw
dvdplayer: fix unused variable after e1b2c94049fa34bc9de7d067ae220664…
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDPlayerVideo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp index 48c3e7b6f2..a8add39774 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp @@ -1206,7 +1206,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts) // don't wait when going ff if (m_speed > DVD_PLAYSPEED_NORMAL) maxWaitTime = 0; - int buffer = g_renderManager.WaitForBuffer(m_bStop, std::max(DVD_TIME_TO_MSEC(iSleepTime) + 500, 10)); + int buffer = g_renderManager.WaitForBuffer(m_bStop, maxWaitTime); if (buffer < 0) { m_droppingStats.AddOutputDropGain(pts, 1/m_fFrameRate); |