diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-02-22 08:08:19 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-02-22 08:08:19 +0000 |
| commit | 0cb25594454dbfe8c855a4c512796897d525e5d4 (patch) | |
| tree | c218aec03400fb612e3b5b97d0a99bdb0b9dc24d /libswscale/swscale.c | |
| parent | b9c2fb34445864e2adc7fe766aaae98f365a0a4a (diff) | |
| download | ffmpeg-0cb25594454dbfe8c855a4c512796897d525e5d4.tar.gz | |
Discard two symbols from libswscale.
Originally committed as revision 26060 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 6bbf61b7a6..4dc2c322e7 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -194,11 +194,11 @@ static volatile uint64_t attribute_used __attribute__((aligned(8))) g5Dither; static volatile uint64_t attribute_used __attribute__((aligned(8))) g6Dither; static volatile uint64_t attribute_used __attribute__((aligned(8))) r5Dither; -DECLARE_ASM_CONST(8, uint64_t, dither4[2])={ +const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]) = { 0x0103010301030103LL, 0x0200020002000200LL,}; -DECLARE_ASM_CONST(8, uint64_t, dither8[2])={ +const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]) = { 0x0602060206020602LL, 0x0004000400040004LL,}; @@ -367,7 +367,7 @@ void in_asm_used_var_warning_killer() { volatile int i= bF8+bFC+w10+ bm00001111+bm00000111+bm11111000+b16Mask+g16Mask+r16Mask+b15Mask+g15Mask+r15Mask+ - ff_M24A+ff_M24B+ff_M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+dither4[0]+dither8[0]+bm01010101; + ff_M24A+ff_M24B+ff_M24C+w02 + b5Dither+g5Dither+r5Dither+g6Dither+ff_dither4[0]+ff_dither8[0]+bm01010101; if (i) i=0; } #endif |