summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 22:12:31 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:16:27 +0200
commit879c7a101b36674a952791d2f97cc38782052435 (patch)
treebf07900c02dde303c2c665c638f25b663cc95412 /core/mplayer.c
parent6c414f8c7a66ce3bb0c2446cb7fb0fb802a9e98b (diff)
downloadmpv-879c7a101b36674a952791d2f97cc38782052435.tar.bz2
mpv-879c7a101b36674a952791d2f97cc38782052435.tar.xz
demux: assume correct-pts mode by default
All demuxers make a reasonable effort to set packet timestamps, and thus support correct-pts mode. This commit also implicitly switches demux_rawvideo to correct-pts mode. We still allow demuxers to disable correct-pts mode in theory.
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index de6b4132fd..f861811b90 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -4233,9 +4233,9 @@ goto_reopen_demuxer: ;
// 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;
+ int val = 1;
+ demux_control(mpctx->demuxer, DEMUXER_CTRL_CORRECT_PTS, &val);
+ opts->correct_pts = val;
}
mpctx->initialized_flags |= INITIALIZED_DEMUXER;