diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-05-18 20:18:08 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-05-18 20:18:08 -0400 |
| commit | e98a95e7792f9452bc790f2552d9ea24d0f7818e (patch) | |
| tree | d3ebcf91661506966c3ec7415f940170736e9d74 | |
| parent | 41e21e4db623ebd77f431a6f30cf21d62d9e1f33 (diff) | |
| download | ffmpeg-e98a95e7792f9452bc790f2552d9ea24d0f7818e.tar.gz | |
10l: wrap float_interleave functions in HAVE_YASM.
fixes compilation with --disable-yasm
| -rw-r--r-- | libavcodec/x86/fmtconvert_mmx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/x86/fmtconvert_mmx.c b/libavcodec/x86/fmtconvert_mmx.c index 61a4272a69..253f60bfc2 100644 --- a/libavcodec/x86/fmtconvert_mmx.c +++ b/libavcodec/x86/fmtconvert_mmx.c @@ -235,6 +235,7 @@ static void float_to_int16_interleave_3dn2(int16_t *dst, const float **src, long float_to_int16_interleave_3dnow(dst, src, len, channels); } +#if HAVE_YASM void ff_float_interleave2_mmx(float *dst, const float **src, unsigned int len); void ff_float_interleave2_sse(float *dst, const float **src, unsigned int len); @@ -262,13 +263,16 @@ static void float_interleave_sse(float *dst, const float **src, else ff_float_interleave_c(dst, src, len, channels); } +#endif void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); if (mm_flags & AV_CPU_FLAG_MMX) { +#if HAVE_YASM c->float_interleave = float_interleave_mmx; +#endif if(mm_flags & AV_CPU_FLAG_3DNOW){ if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ @@ -285,7 +289,9 @@ void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse; c->float_to_int16 = float_to_int16_sse; c->float_to_int16_interleave = float_to_int16_interleave_sse; +#if HAVE_YASM c->float_interleave = float_interleave_sse; +#endif } if(mm_flags & AV_CPU_FLAG_SSE2){ c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse2; |