diff options
-rw-r--r-- | libavcodec/dct-test.c | 1 | ||||
-rw-r--r-- | libavcodec/simple_idct.h | 4 | ||||
-rw-r--r-- | libavcodec/x86/idctdsp_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/simple_idct.c | 3 | ||||
-rw-r--r-- | libavcodec/x86/simple_idct.h | 28 |
5 files changed, 32 insertions, 6 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 8f204a9718..3a2c1acd51 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -47,6 +47,7 @@ #include "faanidct.h" #include "x86/fdct.h" #include "x86/idct_xvid.h" +#include "x86/simple_idct.h" #include "dctref.h" // ALTIVEC diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h index 7c0734b836..154e297470 100644 --- a/libavcodec/simple_idct.h +++ b/libavcodec/simple_idct.h @@ -49,10 +49,6 @@ void ff_simple_idct_12(int16_t *block); */ void ff_prores_idct(int16_t *block, const int16_t *qmat); -void ff_simple_idct_mmx(int16_t *block); -void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); -void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); - void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block); void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block); diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index f367278b93..5bf5cc6ecc 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -22,9 +22,9 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/idctdsp.h" -#include "libavcodec/simple_idct.h" #include "idct_xvid.h" #include "idctdsp.h" +#include "simple_idct.h" /* Input permutation for the simple_idct_mmx */ static const uint8_t simple_mmx_permutation[64] = { diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c index bebc509f64..6b4bd1852e 100644 --- a/libavcodec/x86/simple_idct.c +++ b/libavcodec/x86/simple_idct.c @@ -19,10 +19,11 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/simple_idct.h" + #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "idctdsp.h" +#include "simple_idct.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h new file mode 100644 index 0000000000..4a98732503 --- /dev/null +++ b/libavcodec/x86/simple_idct.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_SIMPLE_IDCT_H +#define AVCODEC_X86_SIMPLE_IDCT_H + +#include <stdint.h> + +void ff_simple_idct_mmx(int16_t *block); +void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); +void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); + +#endif /* AVCODEC_X86_SIMPLE_IDCT_H */ |