[pulseaudio-commits] r1868 - in /branches/lennart/src/pulsecore/ffmpeg: avcodec.h resample2.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed Sep 19 21:03:38 2007
New Revision: 1868

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1868&root=pulseaudio&view=rev
Log:
fix check for lrintf, make resample2.c again identical to upstream ffmpeg

Modified:
    branches/lennart/src/pulsecore/ffmpeg/avcodec.h
    branches/lennart/src/pulsecore/ffmpeg/resample2.c

Modified: branches/lennart/src/pulsecore/ffmpeg/avcodec.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/ffmpeg/avcodec.h?rev=1868&root=pulseaudio&r1=1867&r2=1868&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/ffmpeg/avcodec.h (original)
+++ branches/lennart/src/pulsecore/ffmpeg/avcodec.h Wed Sep 19 21:03:38 2007
@@ -24,6 +24,10 @@
 /* Just a heavily bastardized version of the original file from
  * 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>
@@ -68,4 +72,11 @@
 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 */

Modified: branches/lennart/src/pulsecore/ffmpeg/resample2.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/ffmpeg/resample2.c?rev=1868&root=pulseaudio&r1=1867&r2=1868&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/ffmpeg/resample2.c (original)
+++ branches/lennart/src/pulsecore/ffmpeg/resample2.c Wed Sep 19 21:03:38 2007
@@ -85,13 +85,6 @@
     }
     return v;
 }
-
-/*
- * crude lrintf for non-C99 systems.
- */
-#ifndef HAVE_LFRINTF
-#define lrintf(x) ((long int)(x))
-#endif
 
 /**
  * builds a polyphase filterbank.