RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Default to -correct-pts off if -fps was given, since -fps has no effect 

(and doesn't really make sense) with correct-pts mode.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31316 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-06-04 17:11:56 +00:00
parent f0e84a0b23
commit e41db02518
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmpdemux/demuxer.c
View File

@ -30,6 +30,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#include "m_config.h"
#include "mplayer.h"
#include "libvo/fastmemcpy.h"
@ -252,8 +253,6 @@ demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id,
return d;
}
extern int dvdsub_id;
sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid)
{
if (id > MAX_S_STREAMS - 1 || id < 0) {
@ -1196,7 +1195,7 @@ demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id,
correct_pts = user_correct_pts;
if (correct_pts < 0)
correct_pts = demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL)
correct_pts = !force_fps && demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL)
== DEMUXER_CTRL_OK;
return res;
}