[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

[Stefano Sabatini]

On date Sunday 2010-06-27 23:47:48 +0100, M?ns Rullg?rd wrote:
> Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
> 
> > On date Friday 2010-06-25 20:25:50 +0200, darkshikari wrote:
> >> Author: darkshikari
> >> Date: Fri Jun 25 20:25:49 2010
> >> New Revision: 23783
> >> 
> >> Log:
> >> 16x16 and 8x8c x86 SIMD intra pred functions for VP8 and H.264
> >> 
> >> Added:
> >>    trunk/libavcodec/x86/h264_intrapred.asm
> >> Modified:
> >>    trunk/libavcodec/h264pred.c
> >>    trunk/libavcodec/h264pred.h
> >>    trunk/libavcodec/x86/Makefile
> >>    trunk/libavcodec/x86/dsputil_mmx.c
> >>    trunk/libavcodec/x86/dsputil_mmx.h
> >>    trunk/libavcodec/x86/h264dsp_mmx.c
> >> 
> >> Modified: trunk/libavcodec/h264pred.c
> >> ==============================================================================
> >> --- trunk/libavcodec/h264pred.c	Fri Jun 25 20:14:07 2010	(r23782)
> >> +++ trunk/libavcodec/h264pred.c	Fri Jun 25 20:25:49 2010	(r23783)
> >> @@ -1299,4 +1299,5 @@ void ff_h264_pred_init(H264PredContext *
> >>      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);
> >>  }
> >
> > 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.