diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:00:06 +0200 |
| commit | c37f09693d0edb632c80f8f38ecdb2faf3547f7f (patch) | |
| tree | 44df07eacb522a97bbecd7a3a0f93e8d6a933003 /libmpcodecs/ad_faad.c | |
| parent | 22a06c4ae5672c1dd629918d0a279b8af24e35c3 (diff) | |
| parent | 2aafb808284d74edab6e5320e1114f5c74d5881e (diff) | |
| download | mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.bz2 mpv-c37f09693d0edb632c80f8f38ecdb2faf3547f7f.tar.xz | |
Merge svn changes up to r30643
Diffstat (limited to 'libmpcodecs/ad_faad.c')
| -rw-r--r-- | libmpcodecs/ad_faad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index f3795058ff..14fe9a6280 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -96,7 +96,6 @@ static int init(sh_audio_t *sh) mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: codecdata extracted from WAVEFORMATEX\n"); } if(!sh->codecdata_len) { -#if 1 faacDecConfigurationPtr faac_conf; /* Set the default object type and samplerate */ /* This is useful for RAW AAC files */ @@ -125,7 +124,6 @@ static int init(sh_audio_t *sh) //faac_conf->defObjectType = LTP; // => MAIN, LC, SSR, LTP available. faacDecSetConfiguration(faac_hdec, faac_conf); -#endif sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size); pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len); |