[SCM] libav/experimental: fdct: Move x86-specific declarations to a header in the x86 directory

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 85cabb8d002f2cd100ced5cc17d87bfc9460d314
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Feb 18 13:16:11 2014 +0100

    fdct: Move x86-specific declarations to a header in the x86 directory

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 4f21964..8a601df 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -45,6 +45,7 @@
 #include "aandcttab.h"
 #include "faandct.h"
 #include "faanidct.h"
+#include "x86/fdct.h"
 #include "x86/idct_xvid.h"
 #include "dctref.h"
 
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 3de10b9..3fd4e27 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -60,8 +60,4 @@ void ff_fdct248_islow_10(int16_t *data);
 
 void ff_j_rev_dct(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 */
diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index 6c95439..6528b57 100644
--- a/libavcodec/x86/fdct.c
+++ b/libavcodec/x86/fdct.c
@@ -32,7 +32,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/x86/asm.h"
-#include "libavcodec/dct.h"
+#include "fdct.h"
 
 #if HAVE_MMX_INLINE
 
diff --git a/libavcodec/eaidct.h b/libavcodec/x86/fdct.h
similarity index 80%
copy from libavcodec/eaidct.h
copy to libavcodec/x86/fdct.h
index e78de04..c94a977 100644
--- a/libavcodec/eaidct.h
+++ b/libavcodec/x86/fdct.h
@@ -16,11 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_EAIDCT_H
-#define AVCODEC_EAIDCT_H
+#ifndef AVCODEC_X86_FDCT_H
+#define AVCODEC_X86_FDCT_H
 
 #include <stdint.h>
 
-void ff_ea_idct_put_c(uint8_t *dest, int linesize, int16_t *block);
+void ff_fdct_mmx(int16_t *block);
+void ff_fdct_mmxext(int16_t *block);
+void ff_fdct_sse2(int16_t *block);
 
-#endif /* AVCODEC_EAIDCT_H */
+#endif /* AVCODEC_X86_FDCT_H */
diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdctdsp_init.c
index 93fdd65..4e8e4eb 100644
--- a/libavcodec/x86/fdctdsp_init.c
+++ b/libavcodec/x86/fdctdsp_init.c
@@ -20,8 +20,8 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dct.h"
 #include "libavcodec/fdctdsp.h"
+#include "fdct.h"
 
 av_cold void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx,
                                  unsigned high_bit_depth)
diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c
index 87965fe..1274c13 100644
--- a/libavcodec/x86/mpegvideoenc_template.c
+++ b/libavcodec/x86/mpegvideoenc_template.c
@@ -25,6 +25,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/x86/asm.h"
 #include "libavcodec/mpegvideo.h"
+#include "fdct.h"
 
 #undef MMREG_WIDTH
 #undef MM

-- 
Libav/FFmpeg packaging