From 1bfae45a88ac7c24b74a6f7ca6eb4aa27d20c653 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 22 Jun 2013 01:31:25 +0200
Subject: core: don't set correct-pts mode randomly

The default correct-pts mode depended on which demuxer was opened last.
Often this is the subtitle demuxer. The correct-pts mode should be
decided on the demuxer for video instead.
---
 core/mplayer.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'core')

diff --git a/core/mplayer.c b/core/mplayer.c
index f766246f63..67d82fdb35 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4289,6 +4289,14 @@ goto_reopen_demuxer: ;
     if (mpctx->timeline)
         timeline_set_part(mpctx, mpctx->timeline_part, true);
 
+    // Decide correct-pts mode based on first segment of video track
+    opts->correct_pts = opts->user_correct_pts;
+    if (opts->correct_pts < 0) {
+        opts->correct_pts =
+            demux_control(mpctx->demuxer, DEMUXER_CTRL_CORRECT_PTS,
+                          NULL) == DEMUXER_CTRL_OK;
+    }
+
     mpctx->initialized_flags |= INITIALIZED_DEMUXER;
 
     add_subtitle_fonts_from_sources(mpctx);
-- 
cgit v1.2.3