[Mplayer-cvslog] CVS: main/libmpcodecs dec_audio.c,1.19,1.20

[Anders Johansson CVS]

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

Modified Files:
	dec_audio.c 
Log Message:
New features:

-- Support for runtime cpu detection
-- Stand alone compile of libaf 
-- Unlimited number of channels (compiletime switch)
-- Sample format defined by bit-fields
-- New formats: float, A-Law and mu-law 
-- Format conversion set in human readable format 
   i.e. format=4:us_be to set 32 bit unsigned big endian output
-- Format reporting in human readable format
-- Volume control has only one parameter for setting the volume
   i.e. volume=-10.0:1:0:1 to set atenuation = -10dB


Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dec_audio.c	11 Nov 2002 17:28:21 -0000	1.19
+++ dec_audio.c	12 Nov 2002 12:33:56 -0000	1.20
@@ -287,13 +287,13 @@
   // input format: same as codec's output format:
   afs->input.rate   = in_samplerate;
   afs->input.nch    = in_channels;
-  afs->input.format = in_format;
+  afs->input.format = af_format_decode(in_format);
   afs->input.bps    = in_bps;
 
   // 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 = out_format ? out_format : afs->input.format;
+  afs->output.format = af_format_decode(out_format ? out_format : afs->input.format);
   afs->output.bps    = out_bps ? out_bps : afs->input.bps;
 
   // filter config:  
@@ -375,7 +375,7 @@
   afd.len=declen;
   afd.rate=sh_audio->samplerate;
   afd.nch=sh_audio->channels;
-  afd.format=sh_audio->sample_format;
+  afd.format=af_format_decode(sh_audio->sample_format);
   afd.bps=sh_audio->samplesize;
   //pafd=&afd;
 //  printf("\nAF: %d --> ",declen);