summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-06-18 08:34:14 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2011-06-18 08:34:14 -0400
commited63f527f28d1d73589a9e0bac3aed2197f14887 (patch)
treedc626718881e0a57287be65c53ef794f913d9cbb
parentf188a1e0ca12822fd6c607924169d678c7254838 (diff)
downloadffmpeg-streaming-ed63f527f28d1d73589a9e0bac3aed2197f14887.zip
ffmpeg-streaming-ed63f527f28d1d73589a9e0bac3aed2197f14887.tar.gz
Fix build if yasm is not available.
-rw-r--r--libavcodec/x86/dsputil_mmx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index b174b83..5c5ecb2 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -2776,10 +2776,12 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
H264_QPEL_FUNCS(3, 2, sse2);
H264_QPEL_FUNCS(3, 3, sse2);
}
+#if HAVE_YASM
if (bit_depth == 10) {
c->put_h264_chroma_pixels_tab[0]= ff_put_h264_chroma_mc8_10_sse2;
c->avg_h264_chroma_pixels_tab[0]= ff_avg_h264_chroma_mc8_10_sse2;
}
+#endif
}
#if HAVE_SSSE3
if(mm_flags & AV_CPU_FLAG_SSSE3){
@@ -2878,7 +2880,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
}
#endif
}
-#if HAVE_AVX
+#if HAVE_AVX && HAVE_YASM
if (mm_flags & AV_CPU_FLAG_AVX) {
if (bit_depth == 10) {
c->put_h264_chroma_pixels_tab[0]= ff_put_h264_chroma_mc8_10_avx;
OpenPOWER on IntegriCloud