[MPlayer-cvslog] r32120 - in trunk: mencoder.c mplayer.c stream/cache2.h

[diego]

Author: diego
Date: Thu Sep  9 18:54:35 2010
New Revision: 32120

Log:
Move cache_fill_status extern declaration to cache2.h, where it belongs.

Modified:
   trunk/mencoder.c
   trunk/mplayer.c
   trunk/stream/cache2.h

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Thu Sep  9 18:47:45 2010	(r32119)
+++ trunk/mencoder.c	Thu Sep  9 18:54:35 2010	(r32120)
@@ -110,12 +110,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 audio_id=-1;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Thu Sep  9 18:47:45 2010	(r32119)
+++ trunk/mplayer.c	Thu Sep  9 18:54:35 2010	(r32120)
@@ -259,8 +259,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

Modified: trunk/stream/cache2.h
==============================================================================
--- trunk/stream/cache2.h	Thu Sep  9 18:47:45 2010	(r32119)
+++ trunk/stream/cache2.h	Thu Sep  9 18:54:35 2010	(r32120)
@@ -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);