diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:53:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:53:50 +0200 |
commit | 3c200aa6930dfafdc4abacc49084503fa09dbbf8 (patch) | |
tree | e06ead278ba9c14087718374be6be0dab5fb3285 | |
parent | e7f8493fd8c9f1d0f7618dc068b5cb38e0395574 (diff) | |
parent | 1fda184a85178cfd7b98d9e308d18e1ded76a511 (diff) | |
download | ffmpeg-3c200aa6930dfafdc4abacc49084503fa09dbbf8.tar.gz |
Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'
* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511':
avutil: Add av_cold attributes to init functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavutil/arm/float_dsp_init_arm.c | 3 | ||||
-rw-r--r-- | libavutil/arm/float_dsp_init_neon.c | 3 | ||||
-rw-r--r-- | libavutil/arm/float_dsp_init_vfp.c | 3 | ||||
-rw-r--r-- | libavutil/float_dsp.c | 4 | ||||
-rw-r--r-- | libavutil/hmac.c | 3 | ||||
-rw-r--r-- | libavutil/lls.c | 5 | ||||
-rw-r--r-- | libavutil/ppc/float_dsp_init.c | 3 | ||||
-rw-r--r-- | libavutil/sha.c | 4 | ||||
-rw-r--r-- | libavutil/x86/float_dsp_init.c | 3 |
9 files changed, 20 insertions, 11 deletions
diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c index f721344b39..94d9c2bed3 100644 --- a/libavutil/arm/float_dsp_init_arm.c +++ b/libavutil/arm/float_dsp_init_arm.c @@ -18,11 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/float_dsp.h" #include "cpu.h" #include "float_dsp_arm.h" -void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) +av_cold void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavutil/arm/float_dsp_init_neon.c b/libavutil/arm/float_dsp_init_neon.c index a7245ad92b..617bf5d576 100644 --- a/libavutil/arm/float_dsp_init_neon.c +++ b/libavutil/arm/float_dsp_init_neon.c @@ -21,6 +21,7 @@ #include <stdint.h> +#include "libavutil/attributes.h" #include "libavutil/float_dsp.h" #include "float_dsp_arm.h" @@ -45,7 +46,7 @@ void ff_butterflies_float_neon(float *v1, float *v2, int len); float ff_scalarproduct_float_neon(const float *v1, const float *v2, int len); -void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp) +av_cold void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp) { fdsp->vector_fmul = ff_vector_fmul_neon; fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_neon; diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c index f7e2f54601..21db094d76 100644 --- a/libavutil/arm/float_dsp_init_vfp.c +++ b/libavutil/arm/float_dsp_init_vfp.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/float_dsp.h" #include "cpu.h" #include "float_dsp_arm.h" @@ -28,7 +29,7 @@ void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1, void ff_vector_fmul_reverse_vfp(float *dst, const float *src0, const float *src1, int len); -void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp) +av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp) { int cpu_flags = av_get_cpu_flags(); diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index 76413138ce..64bd2e6437 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -20,7 +20,7 @@ */ #include "config.h" - +#include "libavutil/attributes.h" #include "float_dsp.h" static void vector_fmul_c(float *dst, const float *src0, const float *src1, @@ -115,7 +115,7 @@ float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len) return p; } -void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact) +av_cold void avpriv_float_dsp_init(AVFloatDSPContext *fdsp, int bit_exact) { fdsp->vector_fmul = vector_fmul_c; fdsp->vector_fmac_scalar = vector_fmac_scalar_c; diff --git a/libavutil/hmac.c b/libavutil/hmac.c index e5f1434f9a..c5a1c89250 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -20,6 +20,7 @@ #include <string.h> +#include "attributes.h" #include "hmac.h" #include "md5.h" #include "sha.h" @@ -38,7 +39,7 @@ struct AVHMAC { int keylen; }; -static void sha1_init(void *ctx) +static av_cold void sha1_init(void *ctx) { av_sha_init(ctx, 160); } diff --git a/libavutil/lls.c b/libavutil/lls.c index a27c7ae8ba..dd6442a881 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -28,10 +28,11 @@ #include <math.h> #include <string.h> +#include "attributes.h" #include "version.h" #include "lls.h" -void avpriv_init_lls(LLSModel *m, int indep_count) +av_cold void avpriv_init_lls(LLSModel *m, int indep_count) { memset(m, 0, sizeof(LLSModel)); m->indep_count = indep_count; @@ -118,7 +119,7 @@ double avpriv_evaluate_lls(LLSModel *m, double *param, int order) } #if FF_API_LLS_PRIVATE -void av_init_lls(LLSModel *m, int indep_count) +av_cold void av_init_lls(LLSModel *m, int indep_count) { avpriv_init_lls(m, indep_count); } diff --git a/libavutil/ppc/float_dsp_init.c b/libavutil/ppc/float_dsp_init.c index d9ca53eeec..00e93cf632 100644 --- a/libavutil/ppc/float_dsp_init.c +++ b/libavutil/ppc/float_dsp_init.c @@ -19,11 +19,12 @@ */ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/float_dsp.h" #include "float_dsp_altivec.h" -void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int bit_exact) +av_cold void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int bit_exact) { #if HAVE_ALTIVEC int mm_flags = av_get_cpu_flags(); diff --git a/libavutil/sha.c b/libavutil/sha.c index 9f630fcc87..a1f92f4cd3 100644 --- a/libavutil/sha.c +++ b/libavutil/sha.c @@ -22,6 +22,8 @@ */ #include <string.h> + +#include "attributes.h" #include "avutil.h" #include "bswap.h" #include "sha.h" @@ -249,7 +251,7 @@ static void sha256_transform(uint32_t *state, const uint8_t buffer[64]) } -int av_sha_init(AVSHA* ctx, int bits) +av_cold int av_sha_init(AVSHA *ctx, int bits) { ctx->digest_len = bits >> 5; switch (bits) { diff --git a/libavutil/x86/float_dsp_init.c b/libavutil/x86/float_dsp_init.c index ee7483754f..a041b4623f 100644 --- a/libavutil/x86/float_dsp_init.c +++ b/libavutil/x86/float_dsp_init.c @@ -18,6 +18,7 @@ #include "config.h" +#include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/float_dsp.h" #include "cpu.h" @@ -121,7 +122,7 @@ static void vector_fmul_window_sse(float *dst, const float *src0, } #endif /* HAVE_6REGS && HAVE_INLINE_ASM */ -void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp) +av_cold void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp) { int mm_flags = av_get_cpu_flags(); |