--- libavcodec/dct-test.c | 1 + libavcodec/simple_idct.h | 4 ---- libavcodec/x86/idctdsp_init.c | 2 +- libavcodec/x86/simple_idct.c | 1 + libavcodec/x86/simple_idct.h | 28 ++++++++++++++++++++++++++++ 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 libavcodec/x86/simple_idct.h
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 3e5a5dc..a37898e 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -48,6 +48,7 @@ #include "x86/fdct.h" #include "x86/idct_permutation.h" #include "x86/idct_xvid.h" +#include "x86/simple_idct.h" #include "dctref.h" // BFIN diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h index e257290..7f14aae 100644 --- a/libavcodec/simple_idct.h +++ b/libavcodec/simple_idct.h @@ -44,10 +44,6 @@ void ff_simple_idct_10(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 5d34da2..345ef8c 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -22,10 +22,10 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/idctdsp.h" -#include "libavcodec/simple_idct.h" #include "idct_permutation.h" #include "idct_xvid.h" #include "idctdsp.h" +#include "simple_idct.h" av_cold int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, enum idct_permutation_type perm_type) diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c index bbe5a67..d3daecd 100644 --- a/libavcodec/x86/simple_idct.c +++ b/libavcodec/x86/simple_idct.c @@ -24,6 +24,7 @@ #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 0000000..4fc2914 --- /dev/null +++ b/libavcodec/x86/simple_idct.h @@ -0,0 +1,28 @@ +/* + * 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_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 */ -- 1.8.3.2 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel