[FFmpeg-cvslog] r23783 - in trunk/libavcodec: h264pred.c h264pred.h x86/Makefile x86/dsputil_mmx.c x86/dsputil_mmx.h x86/h264_intrapred.asm x86/h264dsp_mmx.c

[Måns Rullgård]

Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:

>> >> +    if (ARCH_X86) ff_h264_pred_init_x86(h, codec_id);
>> >>  }
>> >
>> > Breaks linking if MMX optimizations are disabled/unavailable.
>> >
>> > /home/stefano/src/ffmpeg.git/libavcodec/h264pred.c:1302: undefined
>> > reference to `ff_h264_pred_init_x86'
>> >
>> > Fixed locally with:
>> >     if (ARCH_X86 && HAVE_MMX) ff_h264_pred_init_x86(h, codec_id);
>> 
>> HAVE_MMX implies ARCH_X86, no need to test both.
>
> True, see patch.
>
> I also suggest to mention MMX in the name function, regards.
>
> From 384a0db14117a44100b11322fe6c070ee128f422 Mon Sep 17 00:00:00 2001
> Message-Id: <384a0db14117a44100b11322fe6c070ee128f422.1277679877.git.stefano.sabatini-lala at poste.it>
> From: Stefano Sabatini <stefano.sabatini-lala at poste.it>
> Date: Mon, 28 Jun 2010 00:22:21 +0200
> Subject: [extend-color-syntax PATCH] Fix linking if MMX is disabled.
>
> ---
>  libavcodec/h264pred.c |    2 +-
>  libavcodec/vp8dsp.c   |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
> index 3353a9a..eff7d89 100644
> --- a/libavcodec/h264pred.c
> +++ b/libavcodec/h264pred.c
> @@ -1299,5 +1299,5 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id){
>      h->pred16x16_add[ HOR_PRED8x8]= pred16x16_horizontal_add_c;
>  
>      if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id);
> -    if (ARCH_X86) ff_h264_pred_init_x86(h, codec_id);
> +    if (HAVE_MMX) ff_h264_pred_init_x86(h, codec_id);
>  }
> diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c
> index 4fb6025..59cf4d6 100644
> --- a/libavcodec/vp8dsp.c
> +++ b/libavcodec/vp8dsp.c
> @@ -452,6 +452,6 @@ av_cold void ff_vp8dsp_init(VP8DSPContext *dsp)
>      VP8_BILINEAR_MC_FUNC(1, 8);
>      VP8_BILINEAR_MC_FUNC(2, 4);
>  
> -    if (ARCH_X86)
> +    if (HAVE_MMX)
>          ff_vp8dsp_init_x86(dsp);
>  }

Looks OK.

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