[MPlayer-cvslog] CVS: main/libao2 ao_pcm.c,1.32,1.33

Diego Biurrun CVS syncmail at mplayerhq.hu
Sat May 13 21:04:41 CEST 2006


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv17304/libao2

Modified Files:
	ao_pcm.c 
Log Message:
Move setting the output filename after the suboption parsing, otherwise it
cannot take the suboptions that were set into account.


Index: ao_pcm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_pcm.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ao_pcm.c	14 Apr 2006 13:18:33 -0000	1.32
+++ ao_pcm.c	13 May 2006 19:04:39 -0000	1.33
@@ -89,12 +89,14 @@
 	};
 	// set defaults
 	ao_pcm_waveheader = 1;
-	ao_outputfilename =
-	      strdup((ao_pcm_waveheader)?"audiodump.wav":"audiodump.pcm");
+
 	if (subopt_parse(ao_subdevice, subopts) != 0) {
 	  return 0;
 	}
 
+	ao_outputfilename =
+	      strdup((ao_pcm_waveheader)?"audiodump.wav":"audiodump.pcm");
+
 	/* bits is only equal to format if (format == 8) or (format == 16);
 	   this means that the following "if" is a kludge and should
 	   really be a switch to be correct in all cases */




More information about the MPlayer-cvslog mailing list