diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:48:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:48:53 +0200 |
| commit | c49b6c3d999c65cbd336a1984306d0c66aa9d2d1 (patch) | |
| tree | b6339a385be3ddaaa301288abe311e4c093e9042 | |
| parent | c5cec9a42bec60894d63467cb0fd4976128d49af (diff) | |
| parent | 4e0799a4d04404abfa8fbc072640be76465158cf (diff) | |
| download | ffmpeg-c49b6c3d999c65cbd336a1984306d0c66aa9d2d1.tar.gz | |
Merge commit '4e0799a4d04404abfa8fbc072640be76465158cf'
* commit '4e0799a4d04404abfa8fbc072640be76465158cf':
swscale: Add some missing av_cold to arch-specific init functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/bfin/swscale_bfin.c | 3 | ||||
| -rw-r--r-- | libswscale/bfin/yuv2rgb_bfin.c | 3 | ||||
| -rw-r--r-- | libswscale/ppc/yuv2yuv_altivec.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 998b07135d..72d89f76dc 100644 --- a/libswscale/bfin/swscale_bfin.c +++ b/libswscale/bfin/swscale_bfin.c @@ -23,6 +23,7 @@ #include <stdint.h> #include "config.h" +#include "libavutil/attributes.h" #include "libswscale/swscale_internal.h" #if defined (__FDPIC__) && CONFIG_SRAM @@ -71,7 +72,7 @@ static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[], return srcSliceH; } -void ff_get_unscaled_swscale_bfin(SwsContext *c) +av_cold void ff_get_unscaled_swscale_bfin(SwsContext *c) { if (c->dstFormat == AV_PIX_FMT_YUV420P && c->srcFormat == AV_PIX_FMT_UYVY422) { av_log(NULL, AV_LOG_VERBOSE, diff --git a/libswscale/bfin/yuv2rgb_bfin.c b/libswscale/bfin/yuv2rgb_bfin.c index 07456e6323..2a36ad55f7 100644 --- a/libswscale/bfin/yuv2rgb_bfin.c +++ b/libswscale/bfin/yuv2rgb_bfin.c @@ -25,6 +25,7 @@ #include <stdint.h> #include "config.h" +#include "libavutil/attributes.h" #include "libswscale/swscale_internal.h" #if defined(__FDPIC__) && CONFIG_SRAM @@ -168,7 +169,7 @@ static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides, outstrides, ff_bfin_yuv2rgb565_line, 0, 565); } -SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c) +av_cold SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c) { SwsFunc f; diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 7ab93861fc..0ef172d7fd 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -24,9 +24,10 @@ #include <inttypes.h> #include "config.h" +#include "libavutil/attributes.h" +#include "libavutil/cpu.h" #include "libswscale/swscale.h" #include "libswscale/swscale_internal.h" -#include "libavutil/cpu.h" #if HAVE_ALTIVEC @@ -183,7 +184,7 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[], #endif /* HAVE_ALTIVEC */ -void ff_get_unscaled_swscale_ppc(SwsContext *c) +av_cold void ff_get_unscaled_swscale_ppc(SwsContext *c) { #if HAVE_ALTIVEC if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) && |