From fdea095e349a2236f4d4a2b6e6a83b2cf001d373 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 14 Nov 2010 11:53:27 +0200 Subject: demux_lavf: mark AVI timestamps non-pts to avoid messages Playing AVI files containing B-frames with demux_lavf printed two "decreasing pts" info messages at the start of the file. We know the timestamps from AVI won't be valid pts, so add a demuxer field to convey that information to the timing code and make that not even try to use the timestamps as valid pts. --- mplayer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 7adde18740..2acd7e672e 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2526,7 +2526,8 @@ static void determine_frame_pts(struct MPContext *mpctx) if (opts->user_pts_assoc_mode) { sh_video->pts_assoc_mode = opts->user_pts_assoc_mode; } else if (sh_video->pts_assoc_mode == 0) { - if (sh_video->codec_reordered_pts != MP_NOPTS_VALUE) + if (mpctx->d_video->demuxer->timestamp_type == TIMESTAMP_TYPE_PTS + && sh_video->codec_reordered_pts != MP_NOPTS_VALUE) sh_video->pts_assoc_mode = 1; else sh_video->pts_assoc_mode = 2; -- cgit v1.2.3