From 60e2c8604d29963e8b4a4dc5f506a3886c58202d Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@symbol.nonexistent.invalid>
Date: Thu, 24 Apr 2008 07:36:43 +0300
Subject: Move movie_aspect to options struct

---
 libvo/aspect.c         | 1 -
 libvo/old_vo_defines.h | 1 +
 libvo/vo_dxr2.c        | 1 -
 libvo/vo_quartz.c      | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'libvo')

diff --git a/libvo/aspect.c b/libvo/aspect.c
index dfed30d976..e9d414ac87 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -22,7 +22,6 @@ float vo_panscanrange = 1.0;
 float force_monitor_aspect=0;
 float monitor_aspect=0;
 float monitor_pixel_aspect=1;
-extern float movie_aspect;
 
 static struct {
   int orgw; // real width
diff --git a/libvo/old_vo_defines.h b/libvo/old_vo_defines.h
index db3084373e..fd266c1896 100644
--- a/libvo/old_vo_defines.h
+++ b/libvo/old_vo_defines.h
@@ -18,4 +18,5 @@
 #define vo_screenwidth global_vo->opts->vo_screenwidth
 #define vo_screenheight global_vo->opts->vo_screenheight
 #define vidmode global_vo->opts->vidmode
+#define movie_aspect global_vo->opts->movie_aspect
 #endif
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 75e0ca1a81..f4fd5e9f63 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -29,7 +29,6 @@
 
 
 extern float monitor_aspect;
-extern float movie_aspect;
 
 int dxr2_fd = -1;
 
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index ddaedd8b99..be869b78c3 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -71,7 +71,6 @@ static int get_image_done = 0;
 
 static int vo_quartz_fs; // we are in fullscreen
 extern float monitor_aspect;
-extern float movie_aspect;
 static float old_movie_aspect;
 
 static int winLevel = 1;
-- 
cgit v1.2.3