summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-29 16:22:33 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-29 16:22:33 +0300
commit4237cb821b9eb5b28f1d14963563077e55225396 (patch)
treeed4e563469c0c87029f7244309635ab7c5dd47b1 /mplayer.c
parentd3113662b040cab1ba8cb44dc90db206f5ec34ca (diff)
downloadmpv-4237cb821b9eb5b28f1d14963563077e55225396.tar.bz2
mpv-4237cb821b9eb5b28f1d14963563077e55225396.tar.xz
Move allocation/free of x11 struct to x11_common.c
Allocate the struct in the init function and free in uninit.
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 1 insertions, 2 deletions
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);