comparison libmpdemux/demux_mkv.c @ 25919:382672c7480a

Allow demuxers to choose a default value for correct_pts
author reimar
date Sun, 03 Feb 2008 12:14:29 +0000
parents baf32110d3fc
children eff9e1b25743
comparison
equal deleted inserted replaced
25918:35698e5aa40c 25919:382672c7480a
1825 { 1825 {
1826 bih->biSize += track->private_size; 1826 bih->biSize += track->private_size;
1827 bih = realloc (bih, bih->biSize); 1827 bih = realloc (bih, bih->biSize);
1828 memcpy (bih + 1, track->private_data, track->private_size); 1828 memcpy (bih + 1, track->private_data, track->private_size);
1829 } 1829 }
1830 track->reorder_timecodes = !correct_pts; 1830 track->reorder_timecodes = user_correct_pts == 0;
1831 if (!vi->id) { 1831 if (!vi->id) {
1832 mp_msg (MSGT_DEMUX,MSGL_WARN, MSGTR_MPDEMUX_MKV_UnknownCodecID, 1832 mp_msg (MSGT_DEMUX,MSGL_WARN, MSGTR_MPDEMUX_MKV_UnknownCodecID,
1833 track->codec_id, track->tnum); 1833 track->codec_id, track->tnum);
1834 free(bih); 1834 free(bih);
1835 return 1; 1835 return 1;
3454 { 3454 {
3455 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv; 3455 mkv_demuxer_t *mkv_d = (mkv_demuxer_t *) demuxer->priv;
3456 3456
3457 switch (cmd) 3457 switch (cmd)
3458 { 3458 {
3459 case DEMUXER_CTRL_CORRECT_PTS:
3460 return DEMUXER_CTRL_OK;
3459 case DEMUXER_CTRL_GET_TIME_LENGTH: 3461 case DEMUXER_CTRL_GET_TIME_LENGTH:
3460 if (mkv_d->duration == 0) 3462 if (mkv_d->duration == 0)
3461 return DEMUXER_CTRL_DONTKNOW; 3463 return DEMUXER_CTRL_DONTKNOW;
3462 3464
3463 *((double *)arg) = (double)mkv_d->duration; 3465 *((double *)arg) = (double)mkv_d->duration;