[FFmpeg-devel] [PATCH] Remove duplicated symbols from libswscale

[Måns Rullgård]

Reimar Doeffinger <Reimar.Doeffinger at stud.uni-karlsruhe.de> writes:

> On Thu, Feb 14, 2008 at 09:26:08PM +0100, Carl Eugen Hoyos wrote:
>>  // the volatile is required because gcc otherwise optimizes some writes away not knowing that these
>>  // are read in the asm block
>> -static volatile uint64_t attribute_used __attribute__((aligned(8))) b5Dither;
>> -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;
>> +volatile DECLARE_ALIGNED(8, uint64_t attribute_used, b5Dither);
>> +volatile DECLARE_ALIGNED(8, uint64_t attribute_used, g5Dither);
>> +volatile DECLARE_ALIGNED(8, uint64_t attribute_used, g6Dither);
>> +volatile DECLARE_ALIGNED(8, uint64_t attribute_used, r5Dither);
>
> global symbols need either a ff_ or av_ prefix (ff_ in this case IMO)

I agree it should be ff_.

>> -DECLARE_ASM_CONST(8, uint64_t, dither4[2])={
>> +const DECLARE_ALIGNED(8, uint64_t, dither4[2]) = {
>>      0x0103010301030103LL,
>>      0x0200020002000200LL,};
>>  
>> -DECLARE_ASM_CONST(8, uint64_t, dither8[2])={
>> +const DECLARE_ALIGNED(8, uint64_t, dither8[2]) = {
>
> Adding const is unrelated, you already sent a patch for that I
> think, if nobody objects just apply that one.

He's also changing the macro used, presumably to get rid of the static
keyword added by DECLARE_ASM_CONST.

-- 
M?ns Rullg?rd
mans at mansr.com