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 /libavcodec/bfin | |
| parent | edf42613500564bf2214c2c2e66b3ff76bc9cb27 (diff) | |
| parent | e99af2a3b1660b4f328335149980064692097cad (diff) | |
| download | ffmpeg-91a61c4c156dcc4d5a8ac579b6b5dd310deeaefe.tar.gz | |
Merge commit 'e99af2a3b1660b4f328335149980064692097cad'
* commit 'e99af2a3b1660b4f328335149980064692097cad':
bfin: Refactor duplicated l1_text/l1_data_B macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
| -rw-r--r-- | libavcodec/bfin/dsputil_bfin.h | 9 | ||||
| -rw-r--r-- | libavcodec/bfin/hpeldsp_bfin.h | 10 |
2 files changed, 2 insertions, 17 deletions
diff --git a/libavcodec/bfin/dsputil_bfin.h b/libavcodec/bfin/dsputil_bfin.h index dc7e8bc0ed..8ee27250df 100644 --- a/libavcodec/bfin/dsputil_bfin.h +++ b/libavcodec/bfin/dsputil_bfin.h @@ -26,14 +26,7 @@ #include <stdint.h> #include "config.h" - -#if defined(__FDPIC__) && CONFIG_SRAM -#define attribute_l1_text __attribute__((l1_text)) -#define attribute_l1_data_b __attribute__((l1_data_B)) -#else -#define attribute_l1_text -#define attribute_l1_data_b -#endif +#include "libavutil/bfin/attributes.h" void ff_bfin_idct(int16_t *block) attribute_l1_text; void ff_bfin_fdct(int16_t *block) attribute_l1_text; diff --git a/libavcodec/bfin/hpeldsp_bfin.h b/libavcodec/bfin/hpeldsp_bfin.h index c6ada7ccbe..2d5b349adb 100644 --- a/libavcodec/bfin/hpeldsp_bfin.h +++ b/libavcodec/bfin/hpeldsp_bfin.h @@ -26,15 +26,7 @@ #include <stdint.h> -#include "config.h" - -#if defined(__FDPIC__) && CONFIG_SRAM -#define attribute_l1_text __attribute__ ((l1_text)) -#define attribute_l1_data_b __attribute__((l1_data_B)) -#else -#define attribute_l1_text -#define attribute_l1_data_b -#endif +#include "libavutil/bfin/attributes.h" void ff_bfin_z_put_pixels16_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; void ff_bfin_z_put_pixels8_xy2 (uint8_t *block, const uint8_t *s0, int dest_size, int line_size, int h) attribute_l1_text; |