diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-21 04:19:43 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:47:43 +0300 |
commit | 49461e04d0ecbf08c636f80b6aa1617db061e92f (patch) | |
tree | 9ffd9785f390fd2c750acdee1fb4c9c7c399a920 /libvo/vo_xv.c | |
parent | 5f39342e01cbbe6527814724a90124a4ff537721 (diff) | |
download | mpv-49461e04d0ecbf08c636f80b6aa1617db061e92f.tar.bz2 mpv-49461e04d0ecbf08c636f80b6aa1617db061e92f.tar.xz |
Move vo_gc,f_gc,vo_hints to x11 struct
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 0892c051bc..9838e7a529 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -306,9 +306,9 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, XChangeWindowAttributes(x11->display, x11->window, xswamask, &xswa); } - if (vo_gc != None) - XFreeGC(x11->display, vo_gc); - vo_gc = XCreateGC(x11->display, x11->window, 0L, &xgcv); + if (x11->vo_gc != None) + XFreeGC(x11->display, x11->vo_gc); + x11->vo_gc = XCreateGC(x11->display, x11->window, 0L, &xgcv); XSync(x11->display, False); #ifdef HAVE_XF86VM if (vm) @@ -453,7 +453,7 @@ static inline void put_xvimage(struct vo *vo, XvImage *xvi) #ifdef HAVE_SHM if (ctx->Shmem_Flag) { - XvShmPutImage(x11->display, x11->xv_port, x11->window, vo_gc, + XvShmPutImage(x11->display, x11->xv_port, x11->window, x11->vo_gc, xvi, 0, 0, ctx->image_width, ctx->image_height, ctx->drwX - (vo_panscan_x >> 1), ctx->drwY - (vo_panscan_y >> 1), vo->dwidth + vo_panscan_x, @@ -462,7 +462,7 @@ static inline void put_xvimage(struct vo *vo, XvImage *xvi) } else #endif { - XvPutImage(x11->display, x11->xv_port, x11->window, vo_gc, + XvPutImage(x11->display, x11->xv_port, x11->window, x11->vo_gc, xvi, 0, 0, ctx->image_width, ctx->image_height, ctx->drwX - (vo_panscan_x >> 1), ctx->drwY - (vo_panscan_y >> 1), vo->dwidth + vo_panscan_x, |