Merge commit '4e0799a4d04404abfa8fbc072640be76465158cf'

* commit '4e0799a4d04404abfa8fbc072640be76465158cf':
  swscale: Add some missing av_cold to arch-specific init functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/37/head
Michael Niedermayer 11 years ago
commit c49b6c3d99
  1. 3
      libswscale/bfin/swscale_bfin.c
  2. 3
      libswscale/bfin/yuv2rgb_bfin.c
  3. 5
      libswscale/ppc/yuv2yuv_altivec.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,

@ -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;

@ -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) &&

Loading…
Cancel
Save