summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-06-13 13:29:57 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-06-13 13:29:57 +0000
commit790dad65f9551eb48728e44afb443998f89e4cea (patch)
tree34f0cf5711bbea8ffb2395d39f5f3f0241d86d31
parent549885f14a9220ed68c55c55f6a6f9f15b8bb34d (diff)
downloadxine-lib-790dad65f9551eb48728e44afb443998f89e4cea.tar.gz
xine-lib-790dad65f9551eb48728e44afb443998f89e4cea.tar.bz2
sync to latest 0.1.10 release of libdvdnav
CVS patchset: 6682 CVS date: 2004/06/13 13:29:57
-rw-r--r--CREDITS2
-rw-r--r--src/input/libdvdnav/vm.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 74a00c4a6..c802453f0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -18,7 +18,7 @@ gsm610 1.0.10 Mike Melanson
liba52 0.7.4
libcdio 0.68
libdts 0.0.2
-libdvdnav 0.1.9 cvs Michael Roitzsch
+libdvdnav 0.1.10 Michael Roitzsch
libfaad 2.0 RC3 cvs Miguel Freitas
libmad 0.15.1b Miguel Freitas
libmpeg2 0.2.1 [*]
diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c
index 1ab8c8e1d..7aee236b4 100644
--- a/src/input/libdvdnav/vm.c
+++ b/src/input/libdvdnav/vm.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: vm.c,v 1.28 2004/04/05 18:01:09 hadess Exp $
+ * $Id: vm.c,v 1.29 2004/06/13 13:29:57 mroi Exp $
*
*/
@@ -450,7 +450,7 @@ void vm_position_get(vm_t *vm, vm_position_t *position) {
time += ((vm->state).pgc->cell_playback[(vm->state).cellN - 1].playback_time.minute & 0x0f) * 60;
time += ((vm->state).pgc->cell_playback[(vm->state).cellN - 1].playback_time.second >> 4 ) * 10;
time += ((vm->state).pgc->cell_playback[(vm->state).cellN - 1].playback_time.second & 0x0f) * 1;
- if (size / time > 30)
+ if (!time || size / time > 30)
/* datarate is too high, it might be a very short, but regular cell */
return;
if (time > 0xff) time = 0xff;