[Mplayer-cvslog] CVS: main/libmpcodecs dec_audio.c,1.29,1.30

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv25497/libmpcodecs

Modified Files:
	dec_audio.c 
Log Message:
10l

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- dec_audio.c	27 Jan 2004 06:30:16 -0000	1.29
+++ dec_audio.c	1 May 2004 20:00:04 -0000	1.30
@@ -294,7 +294,7 @@
   // output format: same as ao driver's input format (if missing, fallback to input)
   afs->output.rate   = *out_samplerate ? *out_samplerate : afs->input.rate;
   afs->output.nch    = *out_channels ? *out_channels : afs->input.nch;
-  afs->output.format = af_format_decode(*out_format ? *out_format : afs->input.format);
+  afs->output.format = *out_format ? af_format_decode(*out_format) : afs->input.format;
   afs->output.bps    = out_bps ? out_bps : afs->input.bps;
 
   // filter config: