diff options
| author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-01 19:59:42 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:13:00 +0200 |
| commit | 4a0f67ca350f5fb696791b74ad30bde09fefc372 (patch) | |
| tree | 24b45658047b78a42867f843cc58b447697233fd /libmpcodecs | |
| parent | 4fc7f3b296d28337e741456cac5fec35d0d34864 (diff) | |
| download | mpv-4a0f67ca350f5fb696791b74ad30bde09fefc372.tar.bz2 mpv-4a0f67ca350f5fb696791b74ad30bde09fefc372.tar.xz | |
ad_faad: fix compilation using external libfaad
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31603 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_faad.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 8a0a5e22f4..2dc6c1f580 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -126,6 +126,7 @@ static int init(sh_audio_t *sh) faacDecSetConfiguration(faac_hdec, faac_conf); sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size); +#if CONFIG_FAAD_INTERNAL /* init the codec, look for LATM */ faac_init = faacDecInit(faac_hdec, sh->a_in_buffer, sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1); @@ -144,6 +145,11 @@ static int init(sh_audio_t *sh) if (faac_init >= 0) break; } } +#else + /* external faad does not have latm lookup support */ + faac_init = faacDecInit(faac_hdec, sh->a_in_buffer, + sh->a_in_buffer_len, &faac_samplerate, &faac_channels); +#endif if (faac_init < 0) { pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len); @@ -157,8 +163,13 @@ static int init(sh_audio_t *sh) } /* init the codec */ +#if CONFIG_FAAD_INTERNAL faac_init = faacDecInit(faac_hdec, sh->a_in_buffer, sh->a_in_buffer_len, &faac_samplerate, &faac_channels,0); +#else + faac_init = faacDecInit(faac_hdec, sh->a_in_buffer, + sh->a_in_buffer_len, &faac_samplerate, &faac_channels); +#endif } sh->a_in_buffer_len -= (faac_init > 0)?faac_init:0; // how many bytes init consumed |