summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-09-09 16:54:35 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:45 +0200
commit77fb7376e4c3f3f405711c1bacb96d8315f1d5e8 (patch)
tree068e84b7379e2865410b43dbc57077895f56d9aa
parent62112dedb0a6c874289734b2a64d9ce93b8ae4f0 (diff)
downloadmpv-77fb7376e4c3f3f405711c1bacb96d8315f1d5e8.tar.bz2
mpv-77fb7376e4c3f3f405711c1bacb96d8315f1d5e8.tar.xz
cache: Move cache_fill_status extern declaration to cache2.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32120 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mencoder.c4
-rw-r--r--mplayer.c2
-rw-r--r--stream/cache2.h2
3 files changed, 2 insertions, 6 deletions
diff --git a/mencoder.c b/mencoder.c
index 960799f67f..34053e3fce 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -116,12 +116,8 @@ int forced_subs_only=0;
// cache2:
int stream_cache_size=-1;
#ifdef CONFIG_STREAM_CACHE
-extern int cache_fill_status;
-
float stream_cache_min_percent=20.0;
float stream_cache_seek_min_percent=50.0;
-#else
-#define cache_fill_status 0
#endif
int vobsub_id=-1;
diff --git a/mplayer.c b/mplayer.c
index d4a624c696..36537964aa 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -320,8 +320,6 @@ int file_filter=1;
// cache2:
int stream_cache_size=-1;
#ifdef CONFIG_STREAM_CACHE
-extern int cache_fill_status;
-
float stream_cache_min_percent=20.0;
float stream_cache_seek_min_percent=50.0;
#else
diff --git a/stream/cache2.h b/stream/cache2.h
index 330558333e..2e6a4e0dbb 100644
--- a/stream/cache2.h
+++ b/stream/cache2.h
@@ -21,6 +21,8 @@
#include "stream.h"
+extern int cache_fill_status;
+
void cache_uninit(stream_t *s);
int cache_do_control(stream_t *stream, int cmd, void *arg);