RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd' 

* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
  avresample: Add av_cold attributes to init functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-05 11:50:29 +02:00
parent a8ff830b79 e445647b4f
commit b507c00dc0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavresample/audio_mix.c
View File

@ -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;

5
libavresample/dither.c
View File

@ -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;