[FFmpeg-cvslog] x86/h264dsp_init: put a HAVE_YASM back

Michael Niedermayer git at videolan.org
Sun Sep 9 17:27:52 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  9 17:21:02 2012 +0200| [6add8eb2ce165ea943ddeee611fd3f68b85012e0] | committer: Michael Niedermayer

x86/h264dsp_init: put a HAVE_YASM back

Should fix compilation on open solaris

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6add8eb2ce165ea943ddeee611fd3f68b85012e0
---

 libavcodec/x86/h264dsp_init.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
index 7ada495..bb48867 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
 }



More information about the ffmpeg-cvslog mailing list