diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:56:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:56:25 +0100 |
| commit | 3141b04c7fd46ca09acbc4a7b4d89788df273dd7 (patch) | |
| tree | abcef65d35b4384b8a96bfed45c0c5552c802069 /libswscale | |
| parent | 91a61c4c156dcc4d5a8ac579b6b5dd310deeaefe (diff) | |
| parent | da785231ea0b82b5c2526babbb2871c935b21a87 (diff) | |
Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'
* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
bfin: Refactor duplicated assembly-related macros
Conflicts:
libavcodec/bfin/hpel_pixels_bfin.S
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/bfin/internal_bfin.S | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/libswscale/bfin/internal_bfin.S b/libswscale/bfin/internal_bfin.S index eab30aa6ce..5ea0f1f90e 100644 --- a/libswscale/bfin/internal_bfin.S +++ b/libswscale/bfin/internal_bfin.S @@ -93,23 +93,9 @@ huge variation on the reference codes on Blackfin I guess it must have to do with the memory system. */ -#define mL3 .text -#if defined(__FDPIC__) && CONFIG_SRAM -#define mL1 .l1.text -#else -#define mL1 mL3 -#endif -#define MEM mL1 - -#define DEFUN(fname,where,interface) \ - .section where; \ - .global _ff_bfin_ ## fname; \ - .type _ff_bfin_ ## fname, STT_FUNC; \ - .align 8; \ - _ff_bfin_ ## fname +#include "libavutil/bfin/asm.h" -#define DEFUN_END(fname) \ - .size _ff_bfin_ ## fname, . - _ff_bfin_ ## fname +#define MEM mL1 .text |