diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 13:27:24 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 13:27:24 +0100 |
commit | 6c3888487686a2e6cd505cb60d58106954e3569b (patch) | |
tree | fed5222c8da1b4957ad67cdcbdf878ee7370a07c /libavcodec/ppc/int_altivec.c | |
parent | 0ddca7d416cc8b80d9943405d6d0bb39bc2dec06 (diff) | |
parent | 620289a20e022b9c16c10d546ef86cc0bb77cc84 (diff) | |
download | ffmpeg-6c3888487686a2e6cd505cb60d58106954e3569b.tar.gz |
Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
sh4: Fix silly type vs. variable name search and replace typo
configure: Group all hwaccels together in a separate variable
Add av_cold attributes to arch-specific init functions
Conflicts:
configure
libavcodec/arm/mpegvideo_armv5te.c
libavcodec/x86/mlpdsp.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideoenc.c
libavcodec/x86/videodsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc/int_altivec.c')
-rw-r--r-- | libavcodec/ppc/int_altivec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c index 5a73876ad3..4386b13b23 100644 --- a/libavcodec/ppc/int_altivec.c +++ b/libavcodec/ppc/int_altivec.c @@ -28,6 +28,7 @@ #include <altivec.h> #endif +#include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" #include "libavcodec/dsputil.h" @@ -136,7 +137,7 @@ static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1, const int16_t * return ires; } -void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx) +av_cold void ff_int_init_altivec(DSPContext *c, AVCodecContext *avctx) { c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec; c->scalarproduct_int16 = scalarproduct_int16_altivec; |