# HG changeset patch
# User reimar
# Date 1275671516 0
# Node ID a7c91e121d7903f30526534b3ce9da06fd4cc025
# Parent  868e5c480af60f1d387ae8ea2ff4e501a6988055
Default to -correct-pts off if -fps was given, since -fps has no effect
(and doesn't really make sense) with correct-pts mode.

diff -r 868e5c480af6 -r a7c91e121d79 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Fri Jun 04 17:10:38 2010 +0000
+++ b/libmpdemux/demuxer.c	Fri Jun 04 17:11:56 2010 +0000
@@ -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 @@
     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 @@
 
     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;
 }