Mercurial > mplayer.hg

changeset 33035:f5dc85f6f84b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ugly hack to compensate DVDNAV's ugly hacks and fix seeking.
author reimar
date Sat, 26 Mar 2011 21:02:34 +0000
parents e97e23af7e8f
children 19de764d832c
files stream/stream.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream.c	Sat Mar 26 20:22:43 2011 +0000
+++ b/stream/stream.c	Sat Mar 26 21:02:34 2011 +0000
@@ -306,7 +306,9 @@
     len= s->fill_buffer ? s->fill_buffer(s, buf, len) : 0;
   }
   if(len<=0){
-    if (!s->eof) {
+    // dvdnav has some horrible hacks to "suspend" reads,
+    // we need to skip this code or seeks will hang.
+    if (!s->eof && s->type != STREAMTYPE_DVDNAV) {
       // just in case this is an error e.g. due to network
       // timeout reset and retry
       // Seeking is used as a hack to make network streams