[MPlayer-cvslog] CVS: main/libmpcodecs ad_faad.c,1.16,1.17

[Aurelien Jacobs CVS]

CVS change done by Aurelien Jacobs CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv6136/libmpcodecs

Modified Files:
	ad_faad.c 
Log Message:
makes --enable-*-faad really enable without any further check and drop support for old external faad2 versions (<= 1.1)

Index: ad_faad.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_faad.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ad_faad.c	21 Jan 2005 20:50:09 -0000	1.16
+++ ad_faad.c	3 Feb 2005 17:35:49 -0000	1.17
@@ -122,13 +122,8 @@
     }
 
     /* 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 @@
   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 @@
     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);
   }