[FFmpeg-cvslog] Fix linking without yasm.

[Clément Bœsch]

On Sat, Mar 24, 2012 at 02:55:01PM +0100, Carl Eugen Hoyos wrote:
> ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Mar 24 14:54:06 2012 +0100| [5cddfc58d882192d98da1520fdafc4869a3e8099] | committer: Carl Eugen Hoyos
> 
> Fix linking without yasm.
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cddfc58d882192d98da1520fdafc4869a3e8099
> ---
> 
>  libavcodec/x86/vc1dsp_mmx.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c
> index 9c59a21..32891a0 100644
> --- a/libavcodec/x86/vc1dsp_mmx.c
> +++ b/libavcodec/x86/vc1dsp_mmx.c
> @@ -752,7 +752,8 @@ void ff_vc1dsp_init_mmx(VC1DSPContext *dsp)
>          dsp->put_vc1_mspel_pixels_tab[11] = put_vc1_mspel_mc32_mmx;
>          dsp->put_vc1_mspel_pixels_tab[15] = put_vc1_mspel_mc33_mmx;
>  
> -        dsp->put_no_rnd_vc1_chroma_pixels_tab[0]= ff_put_vc1_chroma_mc8_mmx_nornd;
> +        if (HAVE_YASM)
> +            dsp->put_no_rnd_vc1_chroma_pixels_tab[0]= ff_put_vc1_chroma_mc8_mmx_nornd;

I may miss something obvious but isn't this abusing the fact the compiler
will optimize out this branch? Aren't we supposed to use the cpp here?

[...]

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20120324/45853278/attachment.asc>