[Mplayer-cvslog] CVS: main/libmpcodecs ad_faad.c,1.12,1.13

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	ad_faad.c 
Log Message:
If demuxer does not fill codecdata try to get if from waveformatex
(fixes audio format 0xff)


Index: ad_faad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_faad.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ad_faad.c	1 Apr 2004 20:14:59 -0000	1.12
+++ ad_faad.c	14 May 2004 18:47:17 -0000	1.13
@@ -55,6 +55,11 @@
   faac_hdec = faacDecOpen();
 
   // If we don't get the ES descriptor, try manual config
+  if(!sh->codecdata_len && sh->wf) {
+    sh->codecdata_len = sh->wf->cbSize;
+    sh->codecdata = (char*)(sh->wf+1);
+    mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n");
+  }
   if(!sh->codecdata_len) {
 #if 1
     faacDecConfigurationPtr faac_conf;