diff options
| -rw-r--r-- | libavcodec/dct-test.c | 1 | ||||
| -rw-r--r-- | libavcodec/dct.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/fdct.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/fdct.h | 28 | ||||
| -rw-r--r-- | libavcodec/x86/fdctdsp_init.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/mpegvideoenc_template.c | 1 |
6 files changed, 32 insertions, 6 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index ffe365d..8f204a9 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 a500521..9238449 100644 --- a/libavcodec/dct.h +++ b/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 */ diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index f0cd471..112566d 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/x86/fdct.h b/libavcodec/x86/fdct.h new file mode 100644 index 0000000..648cdc5 --- /dev/null +++ b/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 */ diff --git a/libavcodec/x86/fdctdsp_init.c b/libavcodec/x86/fdctdsp_init.c index 261db97..0cb5fd6 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 df0ee63..1899ba2 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 |
