[MPlayer-cvslog] r32586 - trunk/libmpcodecs/ad_faad.c

[reimar]

Author: reimar
Date: Sat Nov  6 17:05:00 2010
New Revision: 32586

Log:
Fix -ac faad with -demuxer lavf.

Modified:
   trunk/libmpcodecs/ad_faad.c

Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c	Sat Nov  6 16:51:33 2010	(r32585)
+++ trunk/libmpcodecs/ad_faad.c	Sat Nov  6 17:05:00 2010	(r32586)
@@ -96,7 +96,7 @@ static int init(sh_audio_t *sh)
     memcpy(sh->codecdata, sh->wf+1, sh->codecdata_len);
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n");
   }
-  if(!sh->codecdata_len) {
+  if(!sh->codecdata_len || sh->format == mmioFOURCC('M', 'P', '4', 'L')) {
     faacDecConfigurationPtr faac_conf;
     /* Set the default object type and samplerate */
     /* This is useful for RAW AAC files */