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/x86/cavsdsp.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/x86/cavsdsp.c')
| -rw-r--r-- | libavcodec/x86/cavsdsp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 6a252e0fb7..470fd53f2e 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/common.h" #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" @@ -446,7 +447,8 @@ CAVS_MC(put_, 16, mmxext) CAVS_MC(avg_, 8, mmxext) CAVS_MC(avg_, 16, mmxext) -static void ff_cavsdsp_init_mmxext(CAVSDSPContext *c, AVCodecContext *avctx) +static av_cold void ff_cavsdsp_init_mmxext(CAVSDSPContext *c, + AVCodecContext *avctx) { #define dspfunc(PFX, IDX, NUM) \ c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \ @@ -474,7 +476,9 @@ CAVS_MC(put_, 16,3dnow) CAVS_MC(avg_, 8, 3dnow) CAVS_MC(avg_, 16,3dnow) -static void ff_cavsdsp_init_3dnow(CAVSDSPContext* c, AVCodecContext *avctx) { +static av_cold void ff_cavsdsp_init_3dnow(CAVSDSPContext *c, + AVCodecContext *avctx) +{ #define dspfunc(PFX, IDX, NUM) \ c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \ c->PFX ## _pixels_tab[IDX][ 2] = ff_ ## PFX ## NUM ## _mc20_3dnow; \ |