[FFmpeg-devel] [PATCH] Fix PPC build.

[Ronald S. Bultje]

Hi,

2011/2/17 M?ns Rullg?rd <mans at mansr.com>:
> M?ns Rullg?rd <mans at mansr.com> writes:
>
>> "Ronald S. Bultje" <rsbultje at gmail.com> writes:
>>
>>> ---
>>> ?libavcodec/ppc/h264_altivec.c ? ? ? ? ?| ? ?6 ------
>>> ?libavcodec/ppc/h264_template_altivec.c | ? 10 ++++++++++
>>> ?libavcodec/ppc/vc1dsp_altivec.c ? ? ? ?| ? 17 +++++++++++++++++
>>> ?3 files changed, 27 insertions(+), 6 deletions(-)
>>>
>>
>> [...]
>>
>>> diff --git a/libavcodec/ppc/h264_template_altivec.c b/libavcodec/ppc/h264_template_altivec.c
>>> index 8cf39c8..29e4d40 100644
>>> --- a/libavcodec/ppc/h264_template_altivec.c
>>> +++ b/libavcodec/ppc/h264_template_altivec.c
>>> @@ -75,6 +75,7 @@
>>> ?#define noop(a) a
>>> ?#define add28(a) vec_add(v28ss, a)
>>>
>>> +#ifdef PREFIX_h264_chroma_mc8_altivec
>>> ?static void PREFIX_h264_chroma_mc8_altivec(uint8_t * dst, uint8_t * src,
>>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int stride, int h, int x, int y) {
>>> ? ? ?DECLARE_ALIGNED(16, signed int, ABCD)[4] =
>>> @@ -201,8 +202,10 @@ static void PREFIX_h264_chroma_mc8_altivec(uint8_t * dst, uint8_t * src,
>>> ? ? ? ? ?}
>>> ? ? ?}
>>> ?}
>>> +#endif
>>
>> I'd prefer not adding to the already excessive ifdeffery in this file.
>> Is there a reason you didn't move the vc1 functions to a different file
>> instead?
>
> OK, I see there's a macro shared with the h264 code. ?Although I don't
> like it at all, this patch is better than a broken build, and the
> obvious alternatives aren't much better.

Pushed, thanks.

Ronald