--- ./plugins/faad2/faad2.c.orig	2007-03-19 12:23:34.000000000 -0500
+++ ./plugins/faad2/faad2.c	2007-04-18 09:02:41.000000000 -0500
@@ -33,7 +33,7 @@
 
 typedef struct
   {
-  faacDecHandle dec;
+  NeAACDecHandle dec;
 
   /* Start and end positions of the sample buffer */
   
@@ -55,7 +55,7 @@
   quicktime_faad2_codec_t *codec = ((quicktime_codec_t*)atrack->codec)->priv;
 
   if(codec->dec)
-    faacDecClose(codec->dec);
+    NeAACDecClose(codec->dec);
 
   if(codec->sample_buffer)
     free(codec->sample_buffer);
@@ -104,7 +104,7 @@
   {
   int i, j, num_packets, num_samples, packet_size;
   float * samples;
-  faacDecFrameInfo frame_info;
+  NeAACDecFrameInfo frame_info;
 
   quicktime_audio_map_t *track_map = &(file->atracks[track]);
   
@@ -135,12 +135,12 @@
     if(codec->upsample)
       num_samples *= 2;
 
-    samples = faacDecDecode(codec->dec, &frame_info,
+    samples = NeAACDecDecode(codec->dec, &frame_info,
                             codec->data, packet_size);
     if(!samples)
       {
-      lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "faacDecDecode failed %s",
-              faacDecGetErrorMessage(frame_info.error));
+      lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "NeAACDecDecode failed %s",
+              NeAACDecGetErrorMessage(frame_info.error));
       
       return 0;
       }
@@ -291,7 +291,7 @@
   unsigned long samplerate;
   unsigned char channels;
 
-  faacDecConfigurationPtr cfg;
+  NeAACDecConfigurationPtr cfg;
   
   quicktime_codec_t *codec_base = (quicktime_codec_t*)atrack->codec;
   quicktime_faad2_codec_t *codec;
@@ -310,7 +310,7 @@
      decode() call, but in this case, we might need to
      set the correct samplerate, which should be known before */
 
-  codec->dec = faacDecOpen();
+  codec->dec = NeAACDecOpen();
 
   stsd = &(atrack->track->mdia.minf.stbl.stsd);
   
@@ -332,13 +332,13 @@
             "No extradata found, decoding is doomed to failure");
     }
 
-  cfg = faacDecGetCurrentConfiguration(codec->dec);
+  cfg = NeAACDecGetCurrentConfiguration(codec->dec);
   cfg->outputFormat = FAAD_FMT_FLOAT;
   
-  faacDecSetConfiguration(codec->dec, cfg);
+  NeAACDecSetConfiguration(codec->dec, cfg);
 
   
-  faacDecInit2(codec->dec, extradata, extradata_size,
+  NeAACDecInit2(codec->dec, extradata, extradata_size,
                &samplerate, &channels);
 
   if(atrack->samplerate != samplerate)
--- ./configure.ac.orig	2007-04-17 12:43:19.000000000 -0500
+++ ./configure.ac	2007-04-18 08:59:03.000000000 -0500
@@ -606,11 +606,11 @@
     {
     int faad_major;
     int faad_minor;
-    faacDecHandle dec;
+    NeAAACDecHandle dec;
 
     if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
       return -1;
-    dec = faacDecOpen();
+    dec = NeAAACDecOpen();
     if(!dec)
       return -1;
     return 0;
--- ./configure.orig	2007-04-17 12:44:19.000000000 -0500
+++ ./configure	2007-04-18 08:59:44.000000000 -0500
@@ -29890,11 +29890,11 @@
     {
     int faad_major;
     int faad_minor;
-    faacDecHandle dec;
+    NeAACDecHandle dec;
 
     if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
       return -1;
-    dec = faacDecOpen();
+    dec = NeAAACDecOpen();
     if(!dec)
       return -1;
     return 0;