summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-03 12:14:29 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-03 12:14:29 +0000
commit40dca58f37bab581ad156f03545efc4428a34cb3 (patch)
tree3e326d33050bc77e35c8f5d16c595a583299c231 /libmpdemux/demux_mkv.c
parent8b068da7ad4cac7ebdb39bf645a53c44f2cf88b8 (diff)
downloadmpv-40dca58f37bab581ad156f03545efc4428a34cb3.tar.bz2
mpv-40dca58f37bab581ad156f03545efc4428a34cb3.tar.xz
Allow demuxers to choose a default value for correct_pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 3d3fed33b1..0d4113180f 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1827,7 +1827,7 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid)
bih = realloc (bih, bih->biSize);
memcpy (bih + 1, track->private_data, track->private_size);
}
- track->reorder_timecodes = !correct_pts;
+ track->reorder_timecodes = user_correct_pts == 0;
if (!vi->id) {
mp_msg (MSGT_DEMUX,MSGL_WARN, MSGTR_MPDEMUX_MKV_UnknownCodecID,
track->codec_id, track->tnum);
@@ -3456,6 +3456,8 @@ demux_mkv_control (demuxer_t *demuxer, int cmd, void *arg)
switch (cmd)
{
+ case DEMUXER_CTRL_CORRECT_PTS:
+ return DEMUXER_CTRL_OK;
case DEMUXER_CTRL_GET_TIME_LENGTH:
if (mkv_d->duration == 0)
return DEMUXER_CTRL_DONTKNOW;