On Mon, Oct 10, 2011 at 12:48:17AM -0400, Justin Ruggles wrote:
> ---
> libavcodec/x86/fmtconvert_mmx.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c
> index 949dc97..6371a89 100644
> --- a/libavcodec/x86/fmtconvert_mmx.c
> +++ b/libavcodec/x86/fmtconvert_mmx.c
> @@ -208,19 +208,19 @@ void ff_fmt_convert_init_x86(FmtConvertContext *c,
> AVCodecContext *avctx)
> #if HAVE_YASM
> c->float_interleave = float_interleave_mmx;
>
> - if(mm_flags & AV_CPU_FLAG_3DNOW){
> + if (mm_flags & AV_CPU_FLAG_3DNOW && HAVE_AMD3DNOW){
> if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
> c->float_to_int16 = ff_float_to_int16_3dnow;
> c->float_to_int16_interleave =
> float_to_int16_interleave_3dnow;
> }
> }
> - if(mm_flags & AV_CPU_FLAG_3DNOWEXT){
> + if (mm_flags & AV_CPU_FLAG_3DNOWEXT && HAVE_AMD3DNOWEXT){
> if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
> c->float_to_int16_interleave =
> float_to_int16_interleave_3dn2;
> }
> }
> #endif
> - if(mm_flags & AV_CPU_FLAG_SSE){
> + if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE){
> c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse;
> #if HAVE_YASM
> c->float_to_int16 = ff_float_to_int16_sse;
> @@ -228,7 +228,7 @@ void ff_fmt_convert_init_x86(FmtConvertContext *c,
> AVCodecContext *avctx)
> c->float_interleave = float_interleave_sse;
> #endif
> }
> - if(mm_flags & AV_CPU_FLAG_SSE2){
> + if (mm_flags & AV_CPU_FLAG_SSE2 && HAVE_SSE){
> c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse2;
> #if HAVE_YASM
> c->float_to_int16 = ff_float_to_int16_sse2;
I think our convention is to have the config option first, doesn't make
difference for the compiler, ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
