From 47452443c50f34219ed0744eae9492f56b32b878 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 11 Dec 2014 23:56:20 +0100
Subject: demux: don't always make --cache-secs override
 --demuxer-readahead-secs

It's confusing. Whether the new behavior is less confusing... whatever.
---
 demux/demux.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'demux/demux.c')

diff --git a/demux/demux.c b/demux/demux.c
index 4f185a517e..ea0464cdae 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -841,14 +841,16 @@ static struct demuxer *open_given_type(struct mpv_global *global,
         .d_thread = talloc(demuxer, struct demuxer),
         .d_buffer = talloc(demuxer, struct demuxer),
         .d_user = demuxer,
-        .min_secs = stream->uncached_stream ? demuxer->opts->demuxer_min_secs_cache
-                                            : demuxer->opts->demuxer_min_secs,
+        .min_secs = demuxer->opts->demuxer_min_secs,
         .min_packs = demuxer->opts->demuxer_min_packs,
         .min_bytes = demuxer->opts->demuxer_min_bytes,
     };
     pthread_mutex_init(&in->lock, NULL);
     pthread_cond_init(&in->wakeup, NULL);
 
+    if (stream->uncached_stream)
+        in->min_secs = MPMAX(in->min_secs, demuxer->opts->demuxer_min_secs_cache);
+
     *in->d_thread = *demuxer;
     *in->d_buffer = *demuxer;
 
-- 
cgit v1.2.3