Merge svn changes r31318 to r31328

r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...

1 files changed, 1 insertions, 1 deletions

diff --git a/mplayer.c b/mplayer.c
index 6be87667cc..53ee3ba199 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3849,7 +3849,7 @@ if(mpctx->sh_video){
 
     if(!mpctx->sh_video->fps && !force_fps){
       mp_tmsg(MSGT_CPLAYER,MSGL_ERR,"FPS not specified in the header or invalid, use the -fps option.\n");
-      mpctx->sh_video=mpctx->d_video->sh=NULL;
+      mpctx->opts.correct_pts = 1;
     }
   }