# HG changeset patch
# User mf0102 <0102@gmx.at>
# Date 1201093922 -3600
# Node ID 6b9d5a8b509eb6594de120f19693aab3c4179fad
# Parent  0dd31200a33aa2613c7c2581fbaaa321001c5aa6# Parent  1a4f8ea5eb2a10614b50a43da70406d41ac8e7bc
automated merge

diff -r 0dd31200a33a -r 6b9d5a8b509e src/aac/libfaad2/cfft.c
--- a/src/aac/libfaad2/cfft.c	Wed Jan 23 14:11:29 2008 +0100
+++ b/src/aac/libfaad2/cfft.c	Wed Jan 23 14:12:02 2008 +0100
@@ -849,12 +849,12 @@
 
 void cfftf(cfft_info *cfft, complex_t *c)
 {
-    cfftf1neg(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)(void*)&(cfft->tab), -1);
+    cfftf1neg(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)(void*)cfft->tab, -1);
 }
 
 void cfftb(cfft_info *cfft, complex_t *c)
 {
-    cfftf1pos(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)(void*)&(cfft->tab), +1);
+    cfftf1pos(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)(void*)cfft->tab, +1);
 }
 
 static void cffti1(uint16_t n, complex_t *wa, uint16_t *ifac)
diff -r 0dd31200a33a -r 6b9d5a8b509e src/neon/neon.c
--- a/src/neon/neon.c	Wed Jan 23 14:11:29 2008 +0100
+++ b/src/neon/neon.c	Wed Jan 23 14:12:02 2008 +0100
@@ -552,9 +552,9 @@
 
         default:
             /* Something went wrong. */
-            _ERROR("<%p> Could not open URL: %d", ret);
+            _ERROR("<%p> Could not open URL: %d", handle, ret);
             if (1 == ret) {
-                _ERROR("<%p> neon error string: %s", ne_get_error(handle->session));
+                _ERROR("<%p> neon error string: %s", handle, ne_get_error(handle->session));
             }
             ne_request_destroy(handle->request);
             _LEAVE -1;