Mercurial > mplayer.hg

changeset 35625:4188b70dc3ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't unconditionally set gtkDXR3Device. Without CONFIG_DXR3 it's not part of gui_opts[] and won't get freed then.
author ib
date Thu, 10 Jan 2013 10:36:43 +0000
parents ce4b3cbeb1d0
children c4954e899b5b
files gui/interface.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Thu Jan 10 10:01:52 2013 +0000
+++ b/gui/interface.c	Thu Jan 10 10:36:43 2013 +0000
@@ -85,8 +85,10 @@
         cdrom_device = strdup(DEFAULT_CDROM_DEVICE);
     if (!dvd_device)
         dvd_device = strdup(DEFAULT_DVD_DEVICE);
+#ifdef CONFIG_DXR3
     if (!gtkDXR3Device)
         gtkDXR3Device = strdup("/dev/em8300-0");
+#endif
 
     if (stream_cache_size > 0) {
         gtkCacheOn   = True;