From ebf6cc4c1a846744195cedd8b513ddc3e82da338 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 20 Sep 2002 18:54:22 +0000
Subject: some mpcodecs option declaration moved to cfg-*, as aren;t used by
 mencoder/mplayer core

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7452 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 cfg-common.h  |  6 ++++++
 cfg-mplayer.h |  5 +++++
 mencoder.c    | 12 +++---------
 mplayer.c     | 10 +---------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/cfg-common.h b/cfg-common.h
index e50f2bb44e..33b5a94d12 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -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 --git a/cfg-mplayer.h b/cfg-mplayer.h
index 2624797c3b..5f39883d42 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -59,6 +59,11 @@ extern int vo_gamma_saturation;
 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 --git a/mencoder.c b/mencoder.c
index 6b71265ae5..8d0aead585 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -90,13 +90,6 @@ char *video_codec=NULL; // override video codec
 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 char *seek_to_sec=NULL;
 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 @@ static int parse_end_at(struct config *conf, const char* param)
     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 @@ static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width,
     free(tmp);
     return dst;
 }
-
+#endif
diff --git a/mplayer.c b/mplayer.c
index 501890f923..67bab0d3de 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -230,15 +230,7 @@ static int play_n_frames_mf=-1;
 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:
-- 
cgit v1.2.3