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

[Diego Biurrun]

On Sat, May 13, 2006 at 08:22:46PM -0700, Corey Hickey wrote:
> Corey Hickey wrote:
> > Diego Biurrun CVS wrote:
> >>
> >> 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.
> >>
> >> --- 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 */
> > 
> > I haven't verified for absolutely 100% sure, but it looks like this is
> > breaking usage of the following:
> > 
> > $ mplayer file.avi -ao pcm:file=audio.wav
> > 
> > Instead of writing to audio.wav, mplayer makes audiodump.wav, ignore the
> > file= suboption.
> 
> Patch attached. Please apply it or some better fix before pre8. :)

Applied with proper indentation, thanks.

Diego