diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:34:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:34:29 +0200 |
| commit | 0aa095483d194c0cfe6acc6dd4c72e545312676e (patch) | |
| tree | 67884d80009d760bcb0889ca410c3c4fee32e9db /libavcodec/iirfilter.c | |
| parent | 057c5d2e1646ee9536edf514b41690c8ffeef6fc (diff) | |
| parent | 6fee1b90ce3bf4fbdfde7016e0890057c9000487 (diff) | |
| download | ffmpeg-0aa095483d194c0cfe6acc6dd4c72e545312676e.tar.gz | |
Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
avcodec: Add av_cold attributes to init functions missing them
Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/iirfilter.c')
| -rw-r--r-- | libavcodec/iirfilter.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index 049150e4ba..a2d9d11250 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -26,6 +26,7 @@ #include "iirfilter.h" #include <math.h> +#include "libavutil/attributes.h" #include "libavutil/common.h" /** @@ -48,10 +49,11 @@ typedef struct FFIIRFilterState{ /// maximum supported filter order #define MAXORDER 30 -static int butterworth_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c, - enum IIRFilterMode filt_mode, - int order, float cutoff_ratio, - float stopband) +static av_cold int butterworth_init_coeffs(void *avc, + struct FFIIRFilterCoeffs *c, + enum IIRFilterMode filt_mode, + int order, float cutoff_ratio, + float stopband) { int i, j; double wa; @@ -113,9 +115,9 @@ static int butterworth_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c, return 0; } -static int biquad_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c, - enum IIRFilterMode filt_mode, int order, - float cutoff_ratio, float stopband) +static av_cold int biquad_init_coeffs(void *avc, struct FFIIRFilterCoeffs *c, + enum IIRFilterMode filt_mode, int order, + float cutoff_ratio, float stopband) { double cos_w0, sin_w0; double a0, x0, x1; |