summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ad_faad.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-14 18:47:17 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-14 18:47:17 +0000
commitc29c6444cdbf5cad866508d710e7663dafe11ede (patch)
tree397e716c705d1f61e012f6f0b21f82b6069d723b /libmpcodecs/ad_faad.c
parentfc2bcda11d52f3a39bbf6a9c84b813f13bcfc475 (diff)
downloadmpv-c29c6444cdbf5cad866508d710e7663dafe11ede.tar.bz2
mpv-c29c6444cdbf5cad866508d710e7663dafe11ede.tar.xz
If demuxer does not fill codecdata try to get if from waveformatex
(fixes audio format 0xff) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12474 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_faad.c')
-rw-r--r--libmpcodecs/ad_faad.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c
index 332a9b02a6..c4cf1b152f 100644
--- a/libmpcodecs/ad_faad.c
+++ b/libmpcodecs/ad_faad.c
@@ -55,6 +55,11 @@ static int init(sh_audio_t *sh)
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;