---
Now moves the declarations to dct.h instead of into a separate fdct.h.
libavcodec/dct-test.c | 2 +-
libavcodec/dct.h | 15 +++++++++++++++
libavcodec/dsputil.c | 1 +
libavcodec/dsputil.h | 14 --------------
libavcodec/jfdctfst.c | 2 +-
libavcodec/jfdctint_template.c | 2 +-
libavcodec/jrevdct.c | 2 +-
libavcodec/mpegvideo_enc.c | 1 +
libavcodec/proresdsp.c | 1 +
libavcodec/x86/dsputilenc_mmx.c | 1 +
libavcodec/x86/fdct.c | 2 +-
libavcodec/x86/mpegvideoenc.c | 2 +-
12 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index cd6480d..0f7f5c3 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -39,7 +39,7 @@
#include "libavutil/lfg.h"
#include "libavutil/time.h"
-#include "dsputil.h"
+#include "dct.h"
#include "simple_idct.h"
#include "aandcttab.h"
#include "faandct.h"
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 905cc01..3de10b9 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -24,6 +24,8 @@
#ifndef AVCODEC_DCT_H
#define AVCODEC_DCT_H
+#include <stdint.h>
+
#include "rdft.h"
struct DCTContext {
@@ -49,4 +51,17 @@ void ff_dct_end (DCTContext *s);
void ff_dct_init_x86(DCTContext *s);
+void ff_fdct_ifast(int16_t *data);
+void ff_fdct_ifast248(int16_t *data);
+void ff_jpeg_fdct_islow_8(int16_t *data);
+void ff_jpeg_fdct_islow_10(int16_t *data);
+void ff_fdct248_islow_8(int16_t *data);
+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/dsputil.c b/libavcodec/dsputil.c
index 9015d9d..36bcdbd 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -30,6 +30,7 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "copy_block.h"
+#include "dct.h"
#include "dsputil.h"
#include "simple_idct.h"
#include "faandct.h"
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 04f8165..8bfc74b 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -35,20 +35,6 @@
//#define DEBUG
-/* dct code */
-
-void ff_fdct_ifast(int16_t *data);
-void ff_fdct_ifast248(int16_t *data);
-void ff_jpeg_fdct_islow_8(int16_t *data);
-void ff_jpeg_fdct_islow_10(int16_t *data);
-void ff_fdct248_islow_8(int16_t *data);
-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);
/* encoding scans */
extern const uint8_t ff_alternate_horizontal_scan[64];
diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c
index b2e41f1..bbcf598 100644
--- a/libavcodec/jfdctfst.c
+++ b/libavcodec/jfdctfst.c
@@ -69,7 +69,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "libavutil/common.h"
-#include "dsputil.h"
+#include "dct.h"
#define DCTSIZE 8
#define GLOBAL(x) x
diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c
index d2fe093..c6a1638 100644
--- a/libavcodec/jfdctint_template.c
+++ b/libavcodec/jfdctint_template.c
@@ -60,7 +60,7 @@
*/
#include "libavutil/common.h"
-#include "dsputil.h"
+#include "dct.h"
#include "bit_depth_template.c"
diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c
index 1da5831..e6846a1 100644
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevdct.c
@@ -63,7 +63,7 @@
*/
#include "libavutil/common.h"
-#include "dsputil.h"
+#include "dct.h"
#define EIGHT_BIT_SAMPLES
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index ee1d022..c709f13 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -32,6 +32,7 @@
#include "libavutil/pixdesc.h"
#include "libavutil/opt.h"
#include "avcodec.h"
+#include "dct.h"
#include "dsputil.h"
#include "mpegvideo.h"
#include "h263.h"
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index cb08862..6d45def 100644
--- a/libavcodec/proresdsp.c
+++ b/libavcodec/proresdsp.c
@@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "dct.h"
#include "dsputil.h"
#include "proresdsp.h"
#include "simple_idct.h"
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
index 985b0cc..29cdb76 100644
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@@ -26,6 +26,7 @@
#include "libavutil/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
+#include "libavcodec/dct.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
#include "libavcodec/mathops.h"
diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c
index b37238d..bd76648 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/dsputil.h"
+#include "libavcodec/dct.h"
#if HAVE_INLINE_ASM
diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c
index d6f74ec..c32c0ce 100644
--- a/libavcodec/x86/mpegvideoenc.c
+++ b/libavcodec/x86/mpegvideoenc.c
@@ -24,7 +24,7 @@
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
+#include "libavcodec/dct.h"
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
