[MPlayer-cvslog] CVS: main/libmpcodecs ad_ffmpeg.c,1.23,1.24

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	ad_ffmpeg.c 
Log Message:
Using channel count, samplerate and input bps values from the container
instead of the decoder breaks some DTS samples where the container says
the audio has 6 channels but the decoder gives 2. In this case take the
number of channels from the decoder instead, the output will almost
certainly be badly garbled anyway if the number of channels is wrong.
patch by Uoti Urpala, uoti <<.>> urpala <<@>> pp1 <<.>> inet <<.>> fi


Index: ad_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_ffmpeg.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ad_ffmpeg.c	30 Mar 2006 08:47:09 -0000	1.23
+++ ad_ffmpeg.c	19 Apr 2006 20:12:01 -0000	1.24
@@ -113,7 +113,8 @@
   sh_audio->samplerate=lavc_context->sample_rate;
   sh_audio->i_bps=lavc_context->bit_rate/8;
   if(sh_audio->wf){
-      sh_audio->channels=sh_audio->wf->nChannels;
+      // If the decoder uses the wrong number of channels all is lost anyway.
+      // sh_audio->channels=sh_audio->wf->nChannels;
       sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
       sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
   }