# HG changeset patch # User reimar # Date 1289059500 0 # Node ID 4be4c1ecaa4c696d2baee3cb5919417066b1738a # Parent 95cc44996d5d849688ed84a7127effcc554cc115 Fix -ac faad with -demuxer lavf. diff -r 95cc44996d5d -r 4be4c1ecaa4c libmpcodecs/ad_faad.c --- a/libmpcodecs/ad_faad.c Sat Nov 06 15:51:33 2010 +0000 +++ b/libmpcodecs/ad_faad.c Sat Nov 06 16:05:00 2010 +0000 @@ -96,7 +96,7 @@ 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 */