Mercurial > mplayer.hg

comparison stream/tvi_v4l.c @ 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 0f1b5b68af32
comparison
equal deleted inserted replaced
27389:f5f36f035807 27390:9d95dc936e66
625 if (!priv->capability.audios && !priv->tv_param->force_audio) priv->tv_param->noaudio = 1; 625 if (!priv->capability.audios && !priv->tv_param->force_audio) priv->tv_param->noaudio = 1;
626 626
627 /* audio init */ 627 /* audio init */
628 if (!priv->tv_param->noaudio) { 628 if (!priv->tv_param->noaudio) {
629 629
630 #if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 630 #ifdef CONFIG_ALSA
631 if (priv->tv_param->alsa) 631 if (priv->tv_param->alsa)
632 audio_in_init(&priv->audio_in, AUDIO_IN_ALSA); 632 audio_in_init(&priv->audio_in, AUDIO_IN_ALSA);
633 else 633 else
634 audio_in_init(&priv->audio_in, AUDIO_IN_OSS); 634 audio_in_init(&priv->audio_in, AUDIO_IN_OSS);
635 #else 635 #else