From 4237cb821b9eb5b28f1d14963563077e55225396 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 29 Apr 2008 16:22:33 +0300 Subject: Move allocation/free of x11 struct to x11_common.c Allocate the struct in the init function and free in uninit. --- mplayer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 92b21165d0..c5f370c0e7 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2575,8 +2575,7 @@ int gui_no_filename=0; mp_msg_init(); #ifdef HAVE_X11 - mpctx->x11_state = talloc_ptrtype(NULL, mpctx->x11_state); - vo_x11_init_state(mpctx->x11_state); + mpctx->x11_state = vo_x11_init_state(); #endif struct MPOpts *opts = &mpctx->opts; set_default_mplayer_options(opts); -- cgit v1.2.3