[xine-cvs] CVS: xine-lib/src/input/libdvdnav vm.c,1.23,1.24

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/input/libdvdnav
In directory sc8-pr-cvs1:/tmp/cvs-serv15576

Modified Files:
	vm.c 
Log Message:
merge libdvdnav cvs (fixes "Red Dragon" RC2 scene selection)


Index: vm.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/vm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vm.c	19 Jul 2003 13:04:03 -0000	1.23
+++ vm.c	3 Aug 2003 09:44:16 -0000	1.24
@@ -429,14 +429,12 @@
   position->still = (vm->state).pgc->cell_playback[(vm->state).cellN - 1].still_time;
   position->block = (vm->state).blockN;
 
-  /* still already detrmined or not at PGC end */
-  if (position->still || (vm->state).cellN < (vm->state).pgc->nr_of_cells)
+  /* handle PGC stills at PGC end */
+  if ((vm->state).cellN == (vm->state).pgc->nr_of_cells && (vm->state).pgc->still_time)
+    position->still += (vm->state).pgc->still_time;
+  /* still already determined */
+  if (position->still)
     return;
-  /* handle PGC stills */
-  if ((vm->state).pgc->still_time) {
-    position->still = (vm->state).pgc->still_time;
-    return;
-  }
   /* This is a rough fix for some strange still situations on some strange DVDs.
    * There are discs (like the German "Back to the Future" RC2) where the only
    * indication of a still is a cell playback time higher than the time the frames