summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-18 22:26:49 +0100
committerwm4 <wm4@nowhere>2015-03-18 22:26:49 +0100
commit47c131bb0c3240df6a9677684d50c96226b54772 (patch)
treecdb5676153f115dedf7c38d46afe212176ab0e8d /video
parent39ed9b7d96f553096eeb02117ff531e42c11951d (diff)
downloadmpv-47c131bb0c3240df6a9677684d50c96226b54772.tar.bz2
mpv-47c131bb0c3240df6a9677684d50c96226b54772.tar.xz
player: warn against non-monotonic video PTS only once
For some reason there were two points in the code where it warned against non-monotonic video PTS. The one in video.c triggered on PTS going backwards or making large jumps forwards, while dec_video.c triggered on PTS going backwards or PTS not changing. Merge them into a single check, which warns against all cases.
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 5687abcb7d..a0bd6cb047 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -363,11 +363,6 @@ struct mp_image *video_decode(struct dec_video *d_video,
pts += frame_time;
}
- if (d_video->decoded_pts != MP_NOPTS_VALUE && pts <= d_video->decoded_pts) {
- MP_WARN(d_video, "Non-monotonic video pts: %f <= %f\n",
- pts, d_video->decoded_pts);
- }
-
if (d_video->has_broken_packet_pts < 0)
d_video->has_broken_packet_pts++;
if (d_video->num_codec_pts_problems || pkt_pts == MP_NOPTS_VALUE)