diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-04 08:47:12 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:04 +0300 |
| commit | 461264756ec9adbb6fa8294aeacd3fbf50f17c46 (patch) | |
| tree | 38925c6098285f532e8ad4ca1de477b68bc19f34 /libvo | |
| parent | 1756771e5174360da868103a5d9123015bf7de4a (diff) | |
| download | mpv-461264756ec9adbb6fa8294aeacd3fbf50f17c46.tar.bz2 mpv-461264756ec9adbb6fa8294aeacd3fbf50f17c46.tar.xz | |
vo_xv.c: remove unnecessary #ifdefs and static vars
Combine code unnecessarily split in 3 #ifdef blocks into one block and
change local variables there were pointlessly declared static to
normal ones.
After this vo_xv.c no longer defines any global or static variables.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_xv.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 0d0fd73fde..18a0aed088 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -181,13 +181,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, struct xvctx *ctx = vo->priv; int i; -#ifdef HAVE_XF86VM - int vm = 0; - unsigned int modeline_width, modeline_height; - static uint32_t vm_width; - static uint32_t vm_height; -#endif - ctx->image_height = height; ctx->image_width = width; ctx->image_format = format; @@ -205,10 +198,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, ctx->is_paused = 0; ctx->visible_buf = -1; -#ifdef HAVE_XF86VM - if (flags & VOFLAG_MODESWITCHING) - vm = 1; -#endif ctx->num_buffers = vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1; @@ -237,6 +226,10 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, hint.width = d_width; hint.height = d_height; #ifdef HAVE_XF86VM + unsigned int modeline_width, modeline_height; + uint32_t vm_width; + uint32_t vm_height; + int vm = flags & VOFLAG_MODESWITCHING; if (vm) { if ((d_width == 0) && (d_height == 0)) |