aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-09 17:21:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-09 17:21:02 +0200
commit6add8eb2ce165ea943ddeee611fd3f68b85012e0 (patch)
tree8bed93f4b2b11ee94a7af6075ffe5da8b03b7e65 /libavcodec
parent17f9626b5dd86085a155922221f41338bc8bba1f (diff)
downloadffmpeg-6add8eb2ce165ea943ddeee611fd3f68b85012e0.tar.gz
x86/h264dsp_init: put a HAVE_YASM back
Should fix compilation on open solaris Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/h264dsp_init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
index 7ada4950cc..bb48867f19 100644
--- a/libavcodec/x86/h264dsp_init.c
+++ b/libavcodec/x86/h264dsp_init.c
@@ -210,6 +210,7 @@ H264_BIWEIGHT_10_SSE(4, 10)
void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
const int chroma_format_idc)
{
+#if HAVE_YASM
int mm_flags = av_get_cpu_flags();
if (chroma_format_idc == 1 && EXTERNAL_MMXEXT(mm_flags))
@@ -371,4 +372,5 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
}
}
}
+#endif
}