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/arm/rv40dsp_init_arm.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/arm/rv40dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/rv40dsp_init_arm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/arm/rv40dsp_init_arm.c b/libavcodec/arm/rv40dsp_init_arm.c index 1f9364ad61..8fd0b9f6e3 100644 --- a/libavcodec/arm/rv40dsp_init_arm.c +++ b/libavcodec/arm/rv40dsp_init_arm.c @@ -20,6 +20,7 @@ #include <stdint.h> +#include "libavutil/attributes.h" #include "libavcodec/avcodec.h" #include "libavcodec/rv34dsp.h" #include "libavutil/arm/cpu.h" @@ -69,7 +70,7 @@ void ff_rv40_v_weak_loop_filter_neon(uint8_t *src, ptrdiff_t stride, int filter_ int filter_q1, int alpha, int beta, int lim_p0q0, int lim_q1, int lim_p1); -static void ff_rv40dsp_init_neon(RV34DSPContext *c) +static av_cold void ff_rv40dsp_init_neon(RV34DSPContext *c) { c->put_pixels_tab[0][ 1] = ff_put_rv40_qpel16_mc10_neon; c->put_pixels_tab[0][ 3] = ff_put_rv40_qpel16_mc30_neon; @@ -138,7 +139,7 @@ static void ff_rv40dsp_init_neon(RV34DSPContext *c) c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon; } -void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext* dsp) +av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); |