RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-22 19:34:14 +00:00
Code Issues Releases Wiki Activity

vo_xv.c: remove unnecessary #ifdefs and static vars

Browse Source 
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.
This commit is contained in:
Uoti Urpala 2008-04-04 08:47:12 +03:00
parent 1756771e51
commit 461264756e
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libvo/vo_xv.c
View File

@ -181,13 +181,6 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
struct xvctx *ctx = vo->priv; struct xvctx *ctx = vo->priv;
int i; 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_height = height;
ctx->image_width = width; ctx->image_width = width;
ctx->image_format = format; 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->is_paused = 0;
ctx->visible_buf = -1; ctx->visible_buf = -1;
#ifdef HAVE_XF86VM
if (flags & VOFLAG_MODESWITCHING)
vm = 1;
#endif
ctx->num_buffers = ctx->num_buffers =
vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1; 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.width = d_width;
hint.height = d_height; hint.height = d_height;
#ifdef HAVE_XF86VM #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 (vm)
{ {
if ((d_width == 0) && (d_height == 0)) if ((d_width == 0) && (d_height == 0))