[Mplayer-cvslog] CVS: main mencoder.c,1.168,1.169 mplayer.c,1.578,1.579 mplayer.h,1.16,1.17

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv13864

Modified Files:
	mencoder.c mplayer.c mplayer.h 
Log Message:


- fix new afm/vfm support
- fix fullscreen with xv
- add cache support


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- mencoder.c	28 Sep 2002 02:23:17 -0000	1.168
+++ mencoder.c	28 Sep 2002 18:03:19 -0000	1.169
@@ -96,8 +96,6 @@
 char *video_codec=NULL; // override video codec
 char **audio_codec_list=NULL; // override video codec
 char **video_codec_list=NULL; // override video codec
-char* audio_fm=NULL;     // override audio codec family 
-char* video_fm=NULL;     // override video codec family 
 char** audio_fm_list=NULL;     // override video codec family 
 char** video_fm_list=NULL;     // override video codec family 
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- mplayer.c	28 Sep 2002 02:23:17 -0000	1.578
+++ mplayer.c	28 Sep 2002 18:03:19 -0000	1.579
@@ -180,8 +180,6 @@
 char *video_codec=NULL; // override video codec
 char **audio_codec_list=NULL; // override video codec
 char **video_codec_list=NULL; // override video codec
-char *audio_fm=NULL;    // override audio codec family 
-char *video_fm=NULL;    // override video codec family 
 char **audio_fm_list=NULL;    // override video codec family 
 char **video_fm_list=NULL;    // override video codec family 
 
@@ -197,7 +195,7 @@
 char* filename=NULL; //"MI2-Trailer.avi";
 
 // cache2:
-static int stream_cache_size=0;
+       int stream_cache_size=0;
 #ifdef USE_STREAM_CACHE
 extern int cache_fill_status;
 #else

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mplayer.h	31 Aug 2002 09:45:42 -0000	1.16
+++ mplayer.h	28 Sep 2002 18:03:20 -0000	1.17
@@ -10,8 +10,8 @@
 extern int fullscreen;
 extern int vcd_track;
 
-extern char * audio_fm;
-extern char * video_fm;
+extern char ** audio_fm_list;
+extern char ** video_fm_list;
 extern char * video_driver;
 extern char * audio_driver;
 extern int    has_audio;
@@ -34,6 +34,7 @@
 
 extern char * filename;
 
+extern int stream_cache_size;
 extern int flip;
 extern int force_ni;
 extern int index_mode;