# HG changeset patch
# User arpi
# Date 1032548062 0
# Node ID 8669e56d2d9898f39142b915bfde94f9e8304663
# Parent  9720e88cd0bc62702fccd790391bc55c5da64b44
some mpcodecs option declaration moved to cfg-*, as aren;t used by
mencoder/mplayer core

diff -r 9720e88cd0bc -r 8669e56d2d98 cfg-common.h
--- a/cfg-common.h	Fri Sep 20 18:39:09 2002 +0000
+++ b/cfg-common.h	Fri Sep 20 18:54:22 2002 +0000
@@ -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;
diff -r 9720e88cd0bc -r 8669e56d2d98 cfg-mplayer.h
--- a/cfg-mplayer.h	Fri Sep 20 18:39:09 2002 +0000
+++ b/cfg-mplayer.h	Fri Sep 20 18:54:22 2002 +0000
@@ -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
diff -r 9720e88cd0bc -r 8669e56d2d98 mencoder.c
--- a/mencoder.c	Fri Sep 20 18:39:09 2002 +0000
+++ b/mencoder.c	Fri Sep 20 18:54:22 2002 +0000
@@ -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
diff -r 9720e88cd0bc -r 8669e56d2d98 mplayer.c
--- a/mplayer.c	Fri Sep 20 18:39:09 2002 +0000
+++ b/mplayer.c	Fri Sep 20 18:54:22 2002 +0000
@@ -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: