[Mplayer-cvslog] CVS: main mplayer.c,1.566,1.567 mencoder.c,1.159,1.160 cfg-common.h,1.56,1.57 cfg-mplayer.h,1.162,1.163

[Arpi of Ize]

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

Modified Files:
	mplayer.c mencoder.c cfg-common.h cfg-mplayer.h 
Log Message:
some mpcodecs option declaration moved to cfg-*, as aren;t used by
mencoder/mplayer core


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- mplayer.c	20 Sep 2002 18:39:08 -0000	1.566
+++ mplayer.c	20 Sep 2002 18:54:22 -0000	1.567
@@ -230,15 +230,7 @@
 char* video_driver=NULL; //"mga"; // default
 char* audio_driver=NULL;
 
-// libvo opts: (defiend at libmpcodecs/vd.c)
-extern int opt_screen_size_x;
-extern int opt_screen_size_y;
-extern int screen_size_xy;
-extern float movie_aspect;
-extern int fullscreen;
-extern int vidmode;
-extern int softzoom;
-extern int flip;
+// codec outfmt flags (defined in libmpcodecs/vd.c)
 extern int vo_flags;
 
 // sub:

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- mencoder.c	14 Sep 2002 10:47:34 -0000	1.159
+++ mencoder.c	20 Sep 2002 18:54:22 -0000	1.160
@@ -90,13 +90,6 @@
 char* audio_fm=NULL;     // override audio codec family 
 char* video_fm=NULL;     // override video codec family 
 
-// libvo opts: (defiend at libmpcodecs/vd.c)
-extern int screen_size_xy;
-extern float movie_aspect;
-extern int softzoom;
-extern int flip;
-
-
 int out_audio_codec=-1;
 int out_video_codec=-1;
 
@@ -209,7 +202,7 @@
 static off_t seek_to_byte=0;
 
 static int parse_end_at(struct config *conf, const char* param);
-static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height);
+//static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height);
 
 #include "get_path.c"
 
@@ -1304,6 +1297,7 @@
     return 1;
 }
 
+#if 0
 /* Flip the image in src and store the result in dst. src and dst may overlap.
    width is the size of each line in bytes. */
 static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width,
@@ -1321,4 +1315,4 @@
     free(tmp);
     return dst;
 }
-
+#endif

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- cfg-common.h	30 Aug 2002 21:44:04 -0000	1.56
+++ cfg-common.h	20 Sep 2002 18:54:22 -0000	1.57
@@ -179,6 +179,12 @@
 
 #include "config.h"
 
+// codec/filter opts: (defiend at libmpcodecs/vd.c)
+extern int screen_size_xy;
+extern float movie_aspect;
+extern int softzoom;
+extern int flip;
+
 #ifdef STREAMING
 /* defined in network.c */
 extern char *network_username;

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- cfg-mplayer.h	10 Sep 2002 20:40:49 -0000	1.162
+++ cfg-mplayer.h	20 Sep 2002 18:54:22 -0000	1.163
@@ -59,6 +59,11 @@
 extern int vo_gamma_contrast;
 extern int vo_gamma_hue;
 
+extern int opt_screen_size_x;
+extern int opt_screen_size_y;
+extern int fullscreen;
+extern int vidmode;
+
 #ifdef USE_OSD
 extern int osd_level;
 #endif