Mercurial > mplayer.hg

diff cfg-common.h @ 27390:9d95dc936e66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x. Use it in all the places that checked for either ALSA 0.9 or 1.x.
author diego
date Wed, 06 Aug 2008 23:19:29 +0000
parents eb7bdbd98210
children 6a89c6949c08
line wrap: on
line diff
--- a/cfg-common.h	Wed Aug 06 07:50:44 2008 +0000
+++ b/cfg-common.h	Wed Aug 06 23:19:29 2008 +0000
@@ -119,9 +119,9 @@
 	{"mjpeg", &stream_tv_defaults.mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"decimation", &stream_tv_defaults.decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
 	{"quality", &stream_tv_defaults.quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 	{"alsa", &stream_tv_defaults.alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#endif /* defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) */
+#endif /* CONFIG_ALSA */
 #endif /* defined(CONFIG_TV_V4L) || defined(CONFIG_TV_V4L2) */
 	{"adevice", &stream_tv_defaults.adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #ifdef CONFIG_TV_TELETEXT