Mercurial > libavcodec.hg

changeset 6190:2aa536e36c89 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add and use DECLARE_ASM_CONST for constants used in assembler code. Should make it easier to work around compilation problems with e.g. ICC.
author reimar
date Sun, 27 Jan 2008 20:50:16 +0000
parents 8b087434f31b
children 0bc5338a2e33
files h264.c i386/motion_est_mmx.c i386/simple_idct_mmx.c
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Sun Jan 27 20:45:49 2008 +0000
+++ b/h264.c	Sun Jan 27 20:50:16 2008 +0000
@@ -5303,7 +5303,7 @@
     return ctx + 4 * cat;
 }
 
-static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
+DECLARE_ASM_CONST(1, const uint8_t, last_coeff_flag_offset_8x8[63]) = {
     0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
     3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
--- a/i386/motion_est_mmx.c	Sun Jan 27 20:45:49 2008 +0000
+++ b/i386/motion_est_mmx.c	Sun Jan 27 20:50:16 2008 +0000
@@ -24,13 +24,13 @@
 #include "dsputil.h"
 #include "x86_cpu.h"
 
-static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={
+DECLARE_ASM_CONST(8, uint64_t, round_tab[3])={
 0x0000000000000000ULL,
 0x0001000100010001ULL,
 0x0002000200020002ULL,
 };
 
-static attribute_used __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL;
+DECLARE_ASM_CONST(8, uint64_t, bone)= 0x0101010101010101LL;
 
 static inline void sad8_1_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
 {
--- a/i386/simple_idct_mmx.c	Sun Jan 27 20:45:49 2008 +0000
+++ b/i386/simple_idct_mmx.c	Sun Jan 27 20:50:16 2008 +0000
@@ -48,8 +48,8 @@
 #define ROW_SHIFT 11
 #define COL_SHIFT 20 // 6
 
-static const uint64_t attribute_used __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-static const uint64_t attribute_used __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
+DECLARE_ASM_CONST(8, uint64_t, wm1010)= 0xFFFF0000FFFF0000ULL;
+DECLARE_ASM_CONST(8, uint64_t, d40000)= 0x0000000000040000ULL;
 
 DECLARE_ALIGNED(8, static const int16_t, coeffs[])= {
         1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,