diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-21 00:37:12 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:46:40 +0300 |
commit | ce76dfdd4ac46e955cc57c6f5c7ae98d8018abab (patch) | |
tree | 14523421fa502bb930d0209aa31c5c713aa4d382 /libvo | |
parent | eaab1ce896adbcb58e6503ea2dcf789d99bd29f5 (diff) | |
download | mpv-ce76dfdd4ac46e955cc57c6f5c7ae98d8018abab.tar.bz2 mpv-ce76dfdd4ac46e955cc57c6f5c7ae98d8018abab.tar.xz |
Move vo_dbpp to options struct
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/old_vo_defines.h | 2 | ||||
-rw-r--r-- | libvo/video_out.c | 3 | ||||
-rw-r--r-- | libvo/video_out.h | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libvo/old_vo_defines.h b/libvo/old_vo_defines.h index b4003937b6..a8231b970a 100644 --- a/libvo/old_vo_defines.h +++ b/libvo/old_vo_defines.h @@ -14,5 +14,5 @@ #define vo_dy global_vo->dy #define vo_dwidth global_vo->dwidth #define vo_dheight global_vo->dheight - +#define vo_dbpp global_vo->opts->vo_dbpp #endif diff --git a/libvo/video_out.c b/libvo/video_out.c index 1f527af08f..179384fd33 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -35,9 +35,6 @@ int vo_depthonscreen=0; int vo_screenwidth=0; int vo_screenheight=0; -// requested resolution/bpp: (-x -y -bpp options) -int vo_dbpp=0; - int vo_nomouse_input = 0; int vo_grabpointer = 1; int vo_doublebuffering = 1; diff --git a/libvo/video_out.h b/libvo/video_out.h index ad298c04f3..70dd3612d8 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -213,6 +213,8 @@ struct vo { void *priv; struct MPOpts *opts; struct vo_x11_state *x11; + + // requested position/resolution int dx; int dy; int dwidth; @@ -248,9 +250,6 @@ extern int vo_depthonscreen; extern int vo_screenwidth; extern int vo_screenheight; -// requested resolution/bpp: (-x -y -bpp options) -extern int vo_dbpp; - extern int vo_grabpointer; extern int vo_doublebuffering; extern int vo_directrendering; |