diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:49:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:49:44 +0100 |
| commit | 91a61c4c156dcc4d5a8ac579b6b5dd310deeaefe (patch) | |
| tree | 98bd17c15769285fd020b0ca70ae9d8ff34e75fe /libswscale | |
| parent | edf42613500564bf2214c2c2e66b3ff76bc9cb27 (diff) | |
| parent | e99af2a3b1660b4f328335149980064692097cad (diff) | |
Merge commit 'e99af2a3b1660b4f328335149980064692097cad'
* commit 'e99af2a3b1660b4f328335149980064692097cad':
bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/bfin/swscale_bfin.c | 13 | ||||
| -rw-r--r-- | libswscale/bfin/yuv2rgb_bfin.c | 13 |
2 files changed, 9 insertions, 17 deletions
diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 33c3ec5201..147b3bf1e0 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 2a36ad55f7..6f4659f15b 100644 --- a/libswscale/bfin/yuv2rgb_bfin.c +++ b/libswscale/bfin/yuv2rgb_bfin.c @@ -26,25 +26,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); |