summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-27 20:53:30 +0100
committerwm4 <wm4@nowhere>2013-11-27 21:14:39 +0100
commitf2b5267e88ca68dd6933c97aa4f12e5c073b5a48 (patch)
treedc2d510b58837fedc8af0aac86521616697d24d1 /video
parent55070ea85f0beeb40195faced18bbc99ee7deb99 (diff)
downloadmpv-f2b5267e88ca68dd6933c97aa4f12e5c073b5a48.tar.bz2
mpv-f2b5267e88ca68dd6933c97aa4f12e5c073b5a48.tar.xz
video: remove commented code
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index adb1a11ab8..1fc156271b 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -261,19 +261,8 @@ struct mp_image *video_decode(struct dec_video *d_video,
if (sort_pts && pkt_pdts != MP_NOPTS_VALUE) {
int delay = -1;
video_vd_control(d_video, VDCTRL_QUERY_UNSEEN_FRAMES, &delay);
- if (delay >= 0) {
- if (delay > d_video->num_buffered_pts)
-#if 0
- // this is disabled because vd_ffmpeg reports the same lag
- // after seek even when there are no buffered frames,
- // leading to incorrect error messages
- mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Not enough buffered pts\n");
-#else
- ;
-#endif
- else
- d_video->num_buffered_pts = delay;
- }
+ if (delay >= 0 && delay < d_video->num_buffered_pts)
+ d_video->num_buffered_pts = delay;
if (d_video->num_buffered_pts ==
sizeof(d_video->buffered_pts) / sizeof(double))
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Too many buffered pts\n");