From e99af2a3b1660b4f328335149980064692097cad Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 22 Jan 2014 02:54:14 -0800 Subject: bfin: Refactor duplicated l1_text/l1_data_B macros --- libswscale/bfin/swscale_bfin.c | 13 +++++-------- libswscale/bfin/yuv2rgb_bfin.c | 13 ++++--------- 2 files changed, 9 insertions(+), 17 deletions(-) (limited to 'libswscale') diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 43c23b4606..97270b8756 100644 --- a/libswscale/bfin/swscale_bfin.c +++ b/libswscale/bfin/swscale_bfin.c @@ -24,21 +24,18 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/bfin/attributes.h" #include "libswscale/swscale_internal.h" -#if defined (__FDPIC__) && CONFIG_SRAM -#define L1CODE __attribute__((l1_text)) -#else -#define L1CODE -#endif - int ff_bfin_uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int width, int height, - int lumStride, int chromStride, int srcStride) L1CODE; + int lumStride, int chromStride, + int srcStride) attribute_l1_text; int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int width, int height, - int lumStride, int chromStride, int srcStride) L1CODE; + int lumStride, int chromStride, + int srcStride) attribute_l1_text; static int uyvytoyv12_unscaled(SwsContext *c, const uint8_t *src[], int srcStride[], int srcSliceY, int srcSliceH, diff --git a/libswscale/bfin/yuv2rgb_bfin.c b/libswscale/bfin/yuv2rgb_bfin.c index 603a33a77f..295dc286e4 100644 --- a/libswscale/bfin/yuv2rgb_bfin.c +++ b/libswscale/bfin/yuv2rgb_bfin.c @@ -25,25 +25,20 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/bfin/attributes.h" #include "libswscale/swscale_internal.h" -#if defined(__FDPIC__) && CONFIG_SRAM -#define L1CODE __attribute__((l1_text)) -#else -#define L1CODE -#endif - void ff_bfin_yuv2rgb555_line(const uint8_t *Y, const uint8_t *U, const uint8_t *V, uint8_t *out, - int w, uint32_t *coeffs) L1CODE; + int w, uint32_t *coeffs) attribute_l1_text; void ff_bfin_yuv2rgb565_line(const uint8_t *Y, const uint8_t *U, const uint8_t *V, uint8_t *out, - int w, uint32_t *coeffs) L1CODE; + int w, uint32_t *coeffs) attribute_l1_text; void ff_bfin_yuv2rgb24_line(const uint8_t *Y, const uint8_t *U, const uint8_t *V, uint8_t *out, - int w, uint32_t *coeffs) L1CODE; + int w, uint32_t *coeffs) attribute_l1_text; typedef void (*ltransform)(const uint8_t *Y, const uint8_t *U, const uint8_t *V, uint8_t *out, int w, uint32_t *coeffs); -- cgit v1.2.3