diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:42:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 11:42:18 +0200 |
| commit | a8ff830b79d05b1c03ae7e2551ff7142e0845cec (patch) | |
| tree | 35911c95ac168e57e97871aa0524a43a2b04268e /libavfilter/x86 | |
| parent | 0aa095483d194c0cfe6acc6dd4c72e545312676e (diff) | |
| parent | 093804a93cc5da3f95f98265a5df116912443cec (diff) | |
| download | ffmpeg-a8ff830b79d05b1c03ae7e2551ff7142e0845cec.tar.gz | |
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'
* commit '093804a93cc5da3f95f98265a5df116912443cec':
avfilter: Add av_cold attributes to init/uninit functions
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/af_volume_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/x86/af_volume_init.c b/libavfilter/x86/af_volume_init.c index beee8ca1f5..81d605f374 100644 --- a/libavfilter/x86/af_volume_init.c +++ b/libavfilter/x86/af_volume_init.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/samplefmt.h" #include "libavutil/x86/cpu.h" @@ -32,7 +33,7 @@ void ff_scale_samples_s32_ssse3_atom(uint8_t *dst, const uint8_t *src, int len, void ff_scale_samples_s32_avx(uint8_t *dst, const uint8_t *src, int len, int volume); -void ff_volume_init_x86(VolumeContext *vol) +av_cold void ff_volume_init_x86(VolumeContext *vol) { int mm_flags = av_get_cpu_flags(); enum AVSampleFormat sample_fmt = av_get_packed_sample_fmt(vol->sample_fmt); |