Commit 3c200aa6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1fda184a'

* commit '1fda184a':
  avutil: Add av_cold attributes to init functions missing them
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e7f8493f 1fda184a
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "cpu.h" #include "cpu.h"
#include "float_dsp_arm.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(); int cpu_flags = av_get_cpu_flags();
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "float_dsp_arm.h" #include "float_dsp_arm.h"
...@@ -45,7 +46,7 @@ void ff_butterflies_float_neon(float *v1, float *v2, int len); ...@@ -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); 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_fmul = ff_vector_fmul_neon;
fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_neon; fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_neon;
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "cpu.h" #include "cpu.h"
#include "float_dsp_arm.h" #include "float_dsp_arm.h"
...@@ -28,7 +29,7 @@ void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1, ...@@ -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, void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
const float *src1, int len); 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(); int cpu_flags = av_get_cpu_flags();
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "float_dsp.h" #include "float_dsp.h"
static void vector_fmul_c(float *dst, const float *src0, const float *src1, 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) ...@@ -115,7 +115,7 @@ float avpriv_scalarproduct_float_c(const float *v1, const float *v2, int len)
return p; 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_fmul = vector_fmul_c;
fdsp->vector_fmac_scalar = vector_fmac_scalar_c; fdsp->vector_fmac_scalar = vector_fmac_scalar_c;
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include "attributes.h"
#include "hmac.h" #include "hmac.h"
#include "md5.h" #include "md5.h"
#include "sha.h" #include "sha.h"
...@@ -38,7 +39,7 @@ struct AVHMAC { ...@@ -38,7 +39,7 @@ struct AVHMAC {
int keylen; int keylen;
}; };
static void sha1_init(void *ctx) static av_cold void sha1_init(void *ctx)
{ {
av_sha_init(ctx, 160); av_sha_init(ctx, 160);
} }
......
...@@ -28,10 +28,11 @@ ...@@ -28,10 +28,11 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "attributes.h"
#include "version.h" #include "version.h"
#include "lls.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)); memset(m, 0, sizeof(LLSModel));
m->indep_count = indep_count; m->indep_count = indep_count;
...@@ -118,7 +119,7 @@ double avpriv_evaluate_lls(LLSModel *m, double *param, int order) ...@@ -118,7 +119,7 @@ double avpriv_evaluate_lls(LLSModel *m, double *param, int order)
} }
#if FF_API_LLS_PRIVATE #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); avpriv_init_lls(m, indep_count);
} }
......
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "float_dsp_altivec.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 #if HAVE_ALTIVEC
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
*/ */
#include <string.h> #include <string.h>
#include "attributes.h"
#include "avutil.h" #include "avutil.h"
#include "bswap.h" #include "bswap.h"
#include "sha.h" #include "sha.h"
...@@ -249,7 +251,7 @@ static void sha256_transform(uint32_t *state, const uint8_t buffer[64]) ...@@ -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; ctx->digest_len = bits >> 5;
switch (bits) { switch (bits) {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "cpu.h" #include "cpu.h"
...@@ -121,7 +122,7 @@ static void vector_fmul_window_sse(float *dst, const float *src0, ...@@ -121,7 +122,7 @@ static void vector_fmul_window_sse(float *dst, const float *src0,
} }
#endif /* HAVE_6REGS && HAVE_INLINE_ASM */ #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(); int mm_flags = av_get_cpu_flags();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment