diff options
author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-03 17:35:49 +0000 |
---|---|---|
committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-03 17:35:49 +0000 |
commit | b6e4a7971295b7f831227b5b36bba10d8d2adc7e (patch) | |
tree | 169d1676fc85810c71e3a4635cc8157bd7de971f /libmpcodecs/ad_faad.c | |
parent | ac8b01d5054af43c00049806aa03af4c9ddb8f0b (diff) | |
download | mpv-b6e4a7971295b7f831227b5b36bba10d8d2adc7e.tar.bz2 mpv-b6e4a7971295b7f831227b5b36bba10d8d2adc7e.tar.xz |
makes --enable-*-faad really enable without any further check and drop support for old external faad2 versions (<= 1.1)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14639 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_faad.c')
-rw-r--r-- | libmpcodecs/ad_faad.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index ab06239376..91253aba6c 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -122,13 +122,8 @@ static int init(sh_audio_t *sh) } /* init the codec */ -#if (FAADVERSION <= 11) - faac_init = faacDecInit(faac_hdec, sh->a_in_buffer, - &faac_samplerate, &faac_channels); -#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 // XXX FIXME: shouldn't we memcpy() here in a_in_buffer ?? --A'rpi @@ -227,11 +222,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) if(!sh->codecdata_len){ // raw aac stream: do { -#if (FAADVERSION <= 11) - faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j); -#else faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j, sh->a_in_buffer_len); -#endif /* update buffer index after faacDecDecode */ if(faac_finfo.bytesconsumed >= sh->a_in_buffer_len) { @@ -253,11 +244,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) unsigned char* bufptr=NULL; int buflen=ds_get_packet(sh->ds, &bufptr); if(buflen<=0) break; -#if (FAADVERSION <= 11) - faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr); -#else faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr, buflen); -#endif // printf("FAAC decoded %d of %d (err: %d) \n",faac_finfo.bytesconsumed,buflen,faac_finfo.error); } |