diff options
author | wm4 <wm4@nowhere> | 2012-08-03 05:55:02 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-03 05:55:02 +0200 |
commit | b4d9647d189a6bb924fc6b415ae18969885f11f1 (patch) | |
tree | f794e727435ef230f52dd1fac7c0f7029dc7b083 /libvo/vo_x11.c | |
parent | 11648493db7db164aa8fe01751b7e5c5e5faa810 (diff) | |
download | mpv-b4d9647d189a6bb924fc6b415ae18969885f11f1.tar.bz2 mpv-b4d9647d189a6bb924fc6b415ae18969885f11f1.tar.xz |
mplayer: do not create X11 state in player frontend
This is about the vo_x11_init_state() call. It basically opens a X11
connection. It's called in the main() function once. It's not really
clear why this isn't done on VO creation instead. Maybe one reason was
that --no-fixed-vo used to be the default: when playing a new file, the
full VO state would be free'd and recreated. Keeping the X11 connection
possibly improved things, although the question is how. In summary,
there is no good reason to do this, and it only adds platform specific
details to the player frontend.
Do the X11 initialization in the respective VOs instead.
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r-- | libvo/vo_x11.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index cee2b0bf0c..75cd7e4415 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -585,10 +585,8 @@ static int query_format(uint32_t format) static void uninit(void) { - if (!myximage) - return; - - freeMyXImage(); + if (myximage) + freeMyXImage(); #ifdef CONFIG_XF86VM vo_vm_close(); |