[MPlayer-cvslog] r26113 - in trunk: mencoder.c mplayer.c

[reimar]

Author: reimar
Date: Thu Feb 28 20:41:40 2008
New Revision: 26113

Log:
Attempt to fix -chapter broken for mkv in r25987


Modified:
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	(original)
+++ trunk/mencoder.c	Thu Feb 28 20:41:40 2008
@@ -602,7 +602,8 @@ if(stream->type==STREAMTYPE_DVDNAV){
  
   if(dvd_chapter>1) {
     float pts;
-    demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL);
+    if (demuxer_seek_chapter(demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0)
+      seek_to_sec = pts;
   }
 
 d_audio=demuxer2 ? demuxer2->audio : demuxer->audio;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Thu Feb 28 20:41:40 2008
@@ -3274,7 +3274,8 @@ if(!mpctx->demuxer) 
   goto goto_next_file;
 if(dvd_chapter>1) {
   float pts;
-  demuxer_seek_chapter(mpctx->demuxer, dvd_chapter-1, 1, &pts, NULL, NULL);
+  if (demuxer_seek_chapter(mpctx->demuxer, dvd_chapter-1, 1, &pts, NULL, NULL) >= 0 && pts > -1.0)
+    seek(mpctx, pts, SEEK_ABSOLUTE);
 }
 
 initialized_flags|=INITIALIZED_DEMUXER;