diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index e44ab125c2..29f47e8b76 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 8995f10a80..a500521dce 100644 --- a/libavcodec/dct.h +++ b/libavcodec/dct.h @@ -24,6 +24,8 @@ #ifndef AVCODEC_DCT_H #define AVCODEC_DCT_H +#include + #include "rdft.h" struct DCTContext { @@ -49,4 +51,20 @@ 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_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 */ diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index aff950ac4e..a68133b76e 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -31,6 +31,7 @@ #include "libavutil/internal.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 b1adeccc25..b772b7e56b 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -35,23 +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_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); /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c index b2e41f107e..bbcf598490 100644 --- a/libavcodec/jfdctfst.c +++ b/libavcodec/jfdctfst.c @@ -69,7 +69,7 @@ #include #include #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 d2fe093b2b..c6a1638107 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 897842cf69..91780b2e44 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 66781f9e24..a3f9e76ac8 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -33,6 +33,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 dd6d72511e..d73de46519 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/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 1e73757d73..7bf71a3e89 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -27,6 +27,7 @@ */ #include "avcodec.h" +#include "dct.h" #include "internal.h" #include "put_bits.h" #include "bytestream.h" diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 25df5d91a7..a3f268e7a8 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 44a3d7cbe8..d35245dbbe 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 d6922bb983..6219667af3 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"