fix check for lrintf, make resample2.c again identical to upstream ffmpeg

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1868 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/pulsecore/ffmpeg/avcodec.h b/src/pulsecore/ffmpeg/avcodec.h
index 775ec96254533b3ed0f8ae9250d74e27633275e6..7e86e7f67d7ce785a5110db6b6da50022518153c 100644 (file)
--- a/src/pulsecore/ffmpeg/avcodec.h
+++ b/src/pulsecore/ffmpeg/avcodec.h
@@ -25,6 +25,10 @@
  * ffmpeg, just enough to get resample2.c to compile without
  * modification -- Lennart */
 
+#if !defined(PACKAGE) && defined(HAVE_CONFIG_H)
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <inttypes.h>
 #include <math.h>
@@ -68,4 +72,11 @@ void av_resample_compensate(struct AVResampleContext *c, int sample_delta, int c
 void av_resample_close(struct AVResampleContext *c);
 void av_build_filter(int16_t *filter, double factor, int tap_count, int phase_count, int scale, int type);
 
+/*
+ * crude lrintf for non-C99 systems.
+ */
+#ifndef HAVE_LFRINTF
+#define lrintf(x) ((long int)(x))
+#endif
+
 #endif /* AVCODEC_H */

diff --git a/src/pulsecore/ffmpeg/resample2.c b/src/pulsecore/ffmpeg/resample2.c
index dfbd52876de489d3c2c4350928c37f0f33a88533..da1443d98f900ab505470b91e7021edb026cd008 100644 (file)
--- a/src/pulsecore/ffmpeg/resample2.c
+++ b/src/pulsecore/ffmpeg/resample2.c
@@ -86,13 +86,6 @@ static double bessel(double x){
     return v;
 }
 
-/*
- * crude lrintf for non-C99 systems.
- */
-#ifndef HAVE_LFRINTF
-#define lrintf(x) ((long int)(x))
-#endif
-
 /**
  * builds a polyphase filterbank.
  * @param factor resampling factor