Mercurial > mplayer.hg

comparison gui/interface.c @ 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 71f19d352561
children c4954e899b5b
comparison
equal deleted inserted replaced
35624:ce4b3cbeb1d0 35625:4188b70dc3ff
83 83
84 if (!cdrom_device) 84 if (!cdrom_device)
85 cdrom_device = strdup(DEFAULT_CDROM_DEVICE); 85 cdrom_device = strdup(DEFAULT_CDROM_DEVICE);
86 if (!dvd_device) 86 if (!dvd_device)
87 dvd_device = strdup(DEFAULT_DVD_DEVICE); 87 dvd_device = strdup(DEFAULT_DVD_DEVICE);
88 #ifdef CONFIG_DXR3
88 if (!gtkDXR3Device) 89 if (!gtkDXR3Device)
89 gtkDXR3Device = strdup("/dev/em8300-0"); 90 gtkDXR3Device = strdup("/dev/em8300-0");
91 #endif
90 92
91 if (stream_cache_size > 0) { 93 if (stream_cache_size > 0) {
92 gtkCacheOn = True; 94 gtkCacheOn = True;
93 gtkCacheSize = stream_cache_size; 95 gtkCacheSize = stream_cache_size;
94 } else if (stream_cache_size == 0) 96 } else if (stream_cache_size == 0)