From d716e3cd7b73b12e40fed20e9e00ea55fba62eb2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Sep 2007 19:03:38 +0000
Subject: 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
---
 src/pulsecore/ffmpeg/avcodec.h   | 11 +++++++++++
 src/pulsecore/ffmpeg/resample2.c |  7 -------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/pulsecore/ffmpeg/avcodec.h b/src/pulsecore/ffmpeg/avcodec.h
index 775ec962..7e86e7f6 100644
--- 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 dfbd5287..da1443d9 100644
--- 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
-- 
cgit