# HG changeset patch
# User reimar
# Date 1204227700 0
# Node ID 2cb4aabb7dd82b1a79efc1540606cdbc894d6899
# Parent  90e9ac3ee4c0a3063741262098fc062aa6b7363e
Attempt to fix -chapter broken for mkv in r25987

diff -r 90e9ac3ee4c0 -r 2cb4aabb7dd8 mencoder.c
--- a/mencoder.c	Thu Feb 28 18:32:17 2008 +0000
+++ b/mencoder.c	Thu Feb 28 19:41:40 2008 +0000
@@ -602,7 +602,8 @@
  
   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;
diff -r 90e9ac3ee4c0 -r 2cb4aabb7dd8 mplayer.c
--- a/mplayer.c	Thu Feb 28 18:32:17 2008 +0000
+++ b/mplayer.c	Thu Feb 28 19:41:40 2008 +0000
@@ -3274,7 +3274,8 @@
   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;