summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-06 08:27:49 +0200
committerUoti Urpala <uau@mplayer2.org>2011-12-06 08:41:12 +0200
commitff6c06ea7ae482aad4255aa6d94eb89840343096 (patch)
tree4d2dc96886a7930571c26857b7a06fd930aacc48 /mplayer.c
parent7ac154065f3acbb38afba7fc0eccd3adf8208ced (diff)
downloadmpv-ff6c06ea7ae482aad4255aa6d94eb89840343096.tar.bz2
mpv-ff6c06ea7ae482aad4255aa6d94eb89840343096.tar.xz
core: minor hrseek tweak (affects vo_vdpau deint frames)
Remove no longer necessary tests from hrseek code. As a result each field of vo_vdpau framerate-doubling deinterlace modes is now considered as a possible seek target.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index f93fb38460..892455c15c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2928,8 +2928,7 @@ static double update_video(struct MPContext *mpctx)
while (1) {
current_module = "filter_video";
- if (!mpctx->hrseek_active
- && vo_get_buffered_frame(video_out, false) >= 0)
+ if (vo_get_buffered_frame(video_out, false) >= 0)
break;
// XXX Time used in this call is not counted in any performance
// timer now
@@ -3627,7 +3626,7 @@ static void run_playloop(struct MPContext *mpctx)
vo_fps = mpctx->sh_video->fps;
bool blit_frame = mpctx->video_out->frame_loaded;
- if (!blit_frame || mpctx->hrseek_active) {
+ if (!blit_frame) {
double frame_time = update_video(mpctx);
blit_frame = mpctx->video_out->frame_loaded;
mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "*** ftime=%5.3f ***\n", frame_time);