| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 09:50:29 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 09:50:37 (GMT) |
| commit | b507c00dc03c81002c8f9950cfd73aad9cc88702 (patch) | |
| tree | 46a1a0eb14663ea65057766a50913e99cf9b3d14 | |
| parent | a8ff830b79d05b1c03ae7e2551ff7142e0845cec (diff) | |
| parent | e445647b4fdf481b13b2743b303d84de4f43bedd (diff) | |
| download | ffmpeg-b507c00dc03c81002c8f9950cfd73aad9cc88702.zip ffmpeg-b507c00dc03c81002c8f9950cfd73aad9cc88702.tar.gz ffmpeg-b507c00dc03c81002c8f9950cfd73aad9cc88702.tar.bz2 | |
Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'
* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
avresample: Add av_cold attributes to init functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavresample/audio_mix.c | 2 | ||||
| -rw-r--r-- | libavresample/dither.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c index b69bfbc..e6f9417 100644 --- a/libavresample/audio_mix.c +++ b/libavresample/audio_mix.c @@ -282,7 +282,7 @@ static void mix_2_to_6_fltp_flt_c(float **samples, float **matrix, int len, } } -static int mix_function_init(AudioMix *am) +static av_cold int mix_function_init(AudioMix *am) { am->func_descr = am->func_descr_generic = "n/a"; am->mix = am->mix_generic = NULL; diff --git a/libavresample/dither.c b/libavresample/dither.c index f24bf5c..17de829 100644 --- a/libavresample/dither.c +++ b/libavresample/dither.c @@ -31,6 +31,7 @@ #include <math.h> #include <stdint.h> +#include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/lfg.h" #include "libavutil/mem.h" @@ -325,8 +326,8 @@ void ff_dither_free(DitherContext **cp) av_freep(cp); } -static void dither_init(DitherDSPContext *ddsp, - enum AVResampleDitherMethod method) +static av_cold void dither_init(DitherDSPContext *ddsp, + enum AVResampleDitherMethod method) { ddsp->quantize = quantize_c; ddsp->ptr_align = 1; |