[FFmpeg-cvslog] mips: Fixing HAVE_MIPSFPU dependencies

[Bojan Zivkovic]

ffmpeg | branch: master | Bojan Zivkovic <bojan at mips.com> | Wed Nov 21 14:00:28 2012 +0100| [e41b518555087a9c04226cec6fd6f71920875982] | committer: Michael Niedermayer

mips: Fixing HAVE_MIPSFPU dependencies

Signed-off-by: Bojan Zivkovic <bojan at mips.com>
Reviewed-by: Vitor Sessak <vitor1001 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/mips/Makefile         |    2 +-
 libavutil/mips/float_dsp_mips.c |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavutil/mips/Makefile b/libavutil/mips/Makefile
index d8abef4..dbfa5aa 100644
--- a/libavutil/mips/Makefile
+++ b/libavutil/mips/Makefile
@@ -1 +1 @@
-MIPSFPU-OBJS-$(HAVE_INLINE_ASM) += mips/float_dsp_mips.o
+OBJS += mips/float_dsp_mips.o
diff --git a/libavutil/mips/float_dsp_mips.c b/libavutil/mips/float_dsp_mips.c
index 30ed20f..8c3611d 100644
--- a/libavutil/mips/float_dsp_mips.c
+++ b/libavutil/mips/float_dsp_mips.c
@@ -50,8 +50,10 @@
  * Reference: libavutil/float_dsp.c
  */
 
+#include "config.h"
 #include "libavutil/float_dsp.h"
 
+#if HAVE_INLINE_ASM && HAVE_MIPSFPU
 static void vector_fmul_mips(float *dst, const float *src0, const float *src1,
                              int len)
 {
@@ -102,7 +104,10 @@ static void vector_fmul_mips(float *dst, const float *src0, const float *src1,
         );
     }
 }
+#endif /* HAVE_INLINE_ASM && HAVE_MIPSFPU */
 
 void ff_float_dsp_init_mips(AVFloatDSPContext *fdsp) {
+#if HAVE_INLINE_ASM && HAVE_MIPSFPU
     fdsp->vector_fmul = vector_fmul_mips;
+#endif /* HAVE_INLINE_ASM && HAVE_MIPSFPU */
 }