[Mplayer-cvslog] CVS: main/libao2 ao_oss.c,1.36,1.37

Arpi of Ize arpi at mplayerhq.hu
Thu Jan 9 10:28:10 CET 2003


Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv21806

Modified Files:
	ao_oss.c 
Log Message:
10l
noticed by Joe Barnett <sanchezthecactus at yahoo.com>


Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ao_oss.c	28 Dec 2002 13:45:04 -0000	1.36
+++ ao_oss.c	9 Jan 2003 09:27:51 -0000	1.37
@@ -149,11 +149,10 @@
   if(ao_data.format!=format)
 	mp_msg(MSGT_AO,MSGL_WARN,"WARNING! Your soundcard does NOT support %s sample format! Broken audio or bad playback speed are possible! Try with '-aop list=format'\n",audio_out_format_name(format));
 #endif
-
   
+  ao_data.channels = channels;
   if(format != AFMT_AC3) {
     // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it
-    ao_data.channels = channels;
     if (ao_data.channels > 2) {
       if ( ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1 ||
 	   ao_data.channels != channels ) {



More information about the MPlayer-cvslog mailing list