--- libavcodec/dct-test.c | 2 +- libavcodec/dsputil.c | 1 + libavcodec/dsputil.h | 14 -------------- libavcodec/fdct.h | 37 +++++++++++++++++++++++++++++++++++++ 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, 47 insertions(+), 20 deletions(-) create mode 100644 libavcodec/fdct.h
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index cd6480d..8075dcd 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 "fdct.h" #include "simple_idct.h" #include "aandcttab.h" #include "faandct.h" diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 9015d9d..a48a371 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -34,6 +34,7 @@ #include "simple_idct.h" #include "faandct.h" #include "faanidct.h" +#include "fdct.h" #include "imgconvert.h" #include "mathops.h" #include "mpegvideo.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/fdct.h b/libavcodec/fdct.h new file mode 100644 index 0000000..b835af3 --- /dev/null +++ b/libavcodec/fdct.h @@ -0,0 +1,37 @@ +/* + * This file is part of Libav. + * + * Libav 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. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_FDCT_H +#define AVCODEC_FDCT_H + +#include <stdint.h> + +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_FDCT_H */ diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c index b2e41f1..48d0fba 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 "fdct.h" #define DCTSIZE 8 #define GLOBAL(x) x diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c index d2fe093..387889f 100644 --- a/libavcodec/jfdctint_template.c +++ b/libavcodec/jfdctint_template.c @@ -60,7 +60,7 @@ */ #include "libavutil/common.h" -#include "dsputil.h" +#include "fdct.h" #include "bit_depth_template.c" diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c index 1da5831..03db15c 100644 --- a/libavcodec/jrevdct.c +++ b/libavcodec/jrevdct.c @@ -63,7 +63,7 @@ */ #include "libavutil/common.h" -#include "dsputil.h" +#include "fdct.h" #define EIGHT_BIT_SAMPLES diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ee1d022..b1157f4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -33,6 +33,7 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "dsputil.h" +#include "fdct.h" #include "mpegvideo.h" #include "h263.h" #include "mathops.h" diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index cb08862..9d34544 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -21,6 +21,7 @@ */ #include "dsputil.h" +#include "fdct.h" #include "proresdsp.h" #include "simple_idct.h" #include "libavutil/common.h" diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 985b0cc..3aef974 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -27,6 +27,7 @@ #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/dsputil.h" +#include "libavcodec/fdct.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/mathops.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index b37238d..e18f9b5 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/fdct.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index d6f74ec..7f24a75 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/fdct.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
