From 1198c031e4233a0cff5aa7d24aab986163f6903a Mon Sep 17 00:00:00 2001
From: Alexander Preisinger <alexander.preisinger@gmail.com>
Date: Mon, 4 Mar 2013 22:41:27 +0100
Subject: vo: Separate vo options from MPOpts

Separate the video output options from the big MPOpts structure and also only
pass the new mp_vo_opts structure to the vo backend.

Move video_driver_list into mp_vo_opts
---
 video/out/vo.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'video/out/vo.h')

diff --git a/video/out/vo.h b/video/out/vo.h
index ce26269a91..5b05deb79b 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -244,7 +244,7 @@ struct vo {
 
     const struct vo_driver *driver;
     void *priv;
-    struct MPOpts *opts;
+    struct mp_vo_opts *opts;
     struct vo_x11_state *x11;
     struct vo_w32_state *w32;
     struct vo_cocoa_state *cocoa;
@@ -282,7 +282,7 @@ struct vo {
     char *window_title;
 };
 
-struct vo *init_best_video_out(struct MPOpts *opts,
+struct vo *init_best_video_out(struct mp_vo_opts *opts,
                                struct mp_fifo *key_fifo,
                                struct input_ctx *input_ctx,
                                struct encode_lavc_context *encode_lavc_ctx);
@@ -324,7 +324,7 @@ void vo_get_src_dst_rects(struct vo *vo, struct mp_rect *out_src,
 
 static inline int aspect_scaling(struct vo *vo)
 {
-  return vo->opts->vo.keepaspect || vo->opts->vo.fs;
+  return vo->opts->keepaspect || vo->opts->fs;
 }
 
 #endif /* MPLAYER_VIDEO_OUT_H */
-- 
cgit v1.2.3