[MPlayer-cvslog] r31316 - trunk/libmpdemux/demuxer.c

[reimar]

Author: reimar
Date: Fri Jun  4 19:11:56 2010
New Revision: 31316

Log:
Default to -correct-pts off if -fps was given, since -fps has no effect
(and doesn't really make sense) with correct-pts mode.

Modified:
   trunk/libmpdemux/demuxer.c

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Fri Jun  4 19:10:38 2010	(r31315)
+++ trunk/libmpdemux/demuxer.c	Fri Jun  4 19:11:56 2010	(r31316)
@@ -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,
     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 
 
     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;
 }