[FFmpeg-cvslog] Fix build if yasm is not available.
Ronald S. Bultje
git at videolan.org
Sun Jun 19 04:16:46 CEST 2011
ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Jun 18 08:34:14 2011 -0400| [ed63f527f28d1d73589a9e0bac3aed2197f14887] | committer: Ronald S. Bultje
Fix build if yasm is not available.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed63f527f28d1d73589a9e0bac3aed2197f14887
---
libavcodec/x86/dsputil_mmx.c | 4 +++-
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;
More information about the ffmpeg-cvslog
mailing list