]> git.sesse.net Git - vlc/blobdiff - modules/access/avio.c
mmdevice: fix crash if several channel volumes change (fixes #12086)
[vlc] / modules / access / avio.c
index 866e58ea9bac80e0a4778ea0048a2b1d6954593b..47615e6d939ddded86fc24ea7cddc28b1228532b 100644 (file)
@@ -307,8 +307,10 @@ static ssize_t Read(access_t *access, uint8_t *data, size_t size)
     int r = avio_read(access->p_sys->context, data, size);
     if (r > 0)
         access->info.i_pos += r;
-    else
+    else {
         access->info.b_eof = true;
+        r = 0;
+    }
     return r;
 }
 
@@ -437,7 +439,7 @@ static int Control(access_t *access, int query, va_list args)
         return VLC_SUCCESS;
     case ACCESS_GET_PTS_DELAY: {
         int64_t *delay = va_arg(args, int64_t *);
-        *delay = DEFAULT_PTS_DELAY; /* FIXME */
+        *delay = INT64_C(1000) * var_InheritInteger(access, "network-caching");
         return VLC_SUCCESS;
     }
     case ACCESS_SET_PAUSE_STATE: {