mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
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
This commit is contained in:
parent
75f799a3d8
commit
d716e3cd7b
2 changed files with 11 additions and 7 deletions
|
|
@ -25,6 +25,10 @@
|
||||||
* ffmpeg, just enough to get resample2.c to compile without
|
* ffmpeg, just enough to get resample2.c to compile without
|
||||||
* modification -- Lennart */
|
* modification -- Lennart */
|
||||||
|
|
||||||
|
#if !defined(PACKAGE) && defined(HAVE_CONFIG_H)
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <math.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_resample_close(struct AVResampleContext *c);
|
||||||
void av_build_filter(int16_t *filter, double factor, int tap_count, int phase_count, int scale, int type);
|
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 */
|
#endif /* AVCODEC_H */
|
||||||
|
|
|
||||||
|
|
@ -86,13 +86,6 @@ static double bessel(double x){
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* crude lrintf for non-C99 systems.
|
|
||||||
*/
|
|
||||||
#ifndef HAVE_LFRINTF
|
|
||||||
#define lrintf(x) ((long int)(x))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* builds a polyphase filterbank.
|
* builds a polyphase filterbank.
|
||||||
* @param factor resampling factor
|
* @param factor resampling factor
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue