Mercurial > mplayer.hg

changeset 32036:dbca781e632f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move cache_fill_status extern declaration to cache2.h, where it belongs.
author diego
date Thu, 09 Sep 2010 16:54:35 +0000
parents bc01ea7a6322
children 7459e0a25235
files mencoder.c mplayer.c stream/cache2.h
diffstat 3 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Thu Sep 09 16:47:45 2010 +0000
+++ b/mencoder.c	Thu Sep 09 16:54:35 2010 +0000
@@ -110,12 +110,8 @@
 // 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 audio_id=-1;
--- a/mplayer.c	Thu Sep 09 16:47:45 2010 +0000
+++ b/mplayer.c	Thu Sep 09 16:54:35 2010 +0000
@@ -259,8 +259,6 @@
 // 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
--- a/stream/cache2.h	Thu Sep 09 16:47:45 2010 +0000
+++ b/stream/cache2.h	Thu Sep 09 16:54:35 2010 +0000
@@ -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);