Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'

[ffmpeg] / libavcodec / dct.h

diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index a500521dce9a8a65c617f760bbeea09e455ccf81..717f21bef39fb483e40afa4cb01208859bd2ad95 100644 (file)
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef AVCODEC_DCT_H
+#if !defined(AVCODEC_DCT_H) && (!defined(FFT_FLOAT) || FFT_FLOAT)
 #define AVCODEC_DCT_H
 
 #include <stdint.h>
@@ -63,8 +63,4 @@ void ff_j_rev_dct4(int16_t *data);
 void ff_j_rev_dct2(int16_t *data);
 void ff_j_rev_dct1(int16_t *data);
 
-void ff_fdct_mmx(int16_t *block);
-void ff_fdct_mmxext(int16_t *block);
-void ff_fdct_sse2(int16_t *block);
-
 #endif /* AVCODEC_DCT_H */