summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-06 16:05:00 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-08 18:05:11 +0200
commit1d99051c598b01ae6e40053156611699b60e1130 (patch)
tree4fe3787c4f8178249756fff7dfc3f78021fea42d
parent50d5197611355e3154ca078a1e2cd2a22bf190c4 (diff)
downloadmpv-1d99051c598b01ae6e40053156611699b60e1130.tar.bz2
mpv-1d99051c598b01ae6e40053156611699b60e1130.tar.xz
ad_faad: Make work with -demuxer lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32586 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/ad_faad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c
index 96abaa5a6d..894d293a8a 100644
--- a/libmpcodecs/ad_faad.c
+++ b/libmpcodecs/ad_faad.c
@@ -97,7 +97,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 */