Merge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314'

* commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314':
  fdct: Move x86-specific declarations to a header in the x86 directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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"
 

libavcodec/dct.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 */

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
 

libavcodec/x86/fdct.h

@@ -0,0 +1,28 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_X86_FDCT_H
+#define AVCODEC_X86_FDCT_H
+
+#include <stdint.h>
+
+void ff_fdct_mmx(int16_t *block);
+void ff_fdct_mmxext(int16_t *block);
+void ff_fdct_sse2(int16_t *block);
+
+#endif /* AVCODEC_X86_FDCT_H */

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)

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