diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:02:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:08:22 +0100 |
commit | 9333bba6ed3212ac14aa5e578f8ae8ad279b36c3 (patch) | |
tree | 3066f8b983433ffc4860b94034e4a7b3905cf476 | |
parent | 77bc34297596476c1644a497615038d18eed63fe (diff) | |
parent | 6655c933a887a2d20707fff657b614aa1d86a25b (diff) | |
download | ffmpeg-9333bba6ed3212ac14aa5e578f8ae8ad279b36c3.tar.gz |
Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
x86: dsputil: Move fpel declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/x86/cavsdsp.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/dsputil_init.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/dsputil_x86.h | 17 | ||||
-rw-r--r-- | libavcodec/x86/fpel.h | 43 | ||||
-rw-r--r-- | libavcodec/x86/fpel_mmx.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/h264_qpel.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 2 |
10 files changed, 51 insertions, 21 deletions
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 805e120db3..2eb696ec97 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -30,6 +30,7 @@ #include "libavcodec/cavsdsp.h" #include "constants.h" #include "dsputil_x86.h" +#include "fpel.h" #include "config.h" #if HAVE_MMX_INLINE diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index d9426c8139..6c7b5218c4 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -31,6 +31,7 @@ #include "libavcodec/simple_idct.h" #include "libavcodec/version.h" #include "dsputil_x86.h" +#include "fpel.h" #include "idct_xvid.h" void ff_put_pixels8_l2_mmxext(uint8_t *dst, uint8_t *src1, uint8_t *src2, diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 5153e18588..c574458a20 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -31,6 +31,7 @@ #include "constants.h" #include "diracdsp_mmx.h" #include "dsputil_x86.h" +#include "fpel.h" #include "inline_asm.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index c848d58123..69850428ad 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -66,23 +66,6 @@ void ff_gmc_sse(uint8_t *dst, uint8_t *src, void ff_vector_clipf_sse(float *dst, const float *src, float min, float max, int len); -void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - void ff_avg_pixels8_x2_mmx(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); diff --git a/libavcodec/x86/fpel.h b/libavcodec/x86/fpel.h new file mode 100644 index 0000000000..2fbbfce26f --- /dev/null +++ b/libavcodec/x86/fpel.h @@ -0,0 +1,43 @@ +/* + * 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_FPEL_H +#define AVCODEC_X86_FPEL_H + +#include <stddef.h> +#include <stdint.h> + +void ff_avg_pixels8_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels16_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_avg_pixels16_sse2(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels8_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels16_mmx(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); +void ff_put_pixels16_sse2(uint8_t *block, const uint8_t *pixels, + ptrdiff_t line_size, int h); + + +#endif /* AVCODEC_X86_FPEL_H */ diff --git a/libavcodec/x86/fpel_mmx.c b/libavcodec/x86/fpel_mmx.c index 885cb4f22a..45cc57e6d7 100644 --- a/libavcodec/x86/fpel_mmx.c +++ b/libavcodec/x86/fpel_mmx.c @@ -25,7 +25,7 @@ #include <stdint.h> #include "config.h" -#include "dsputil_x86.h" +#include "fpel.h" #include "inline_asm.h" #if HAVE_MMX_INLINE diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 3422fd1897..a051b12b07 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -26,7 +26,7 @@ #include "libavcodec/h264qpel.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/pixels.h" -#include "dsputil_x86.h" +#include "fpel.h" #if HAVE_YASM void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index 492cc47c0a..3c9515a3d2 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -30,6 +30,7 @@ #include "libavcodec/hpeldsp.h" #include "libavcodec/pixels.h" #include "dsputil_x86.h" +#include "fpel.h" void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index 9bd5ae3666..aff4b264e3 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -28,7 +28,7 @@ #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" #include "libavcodec/vc1dsp.h" -#include "dsputil_x86.h" +#include "fpel.h" #include "vc1dsp.h" #include "config.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 942aa42b45..5b71de367b 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -30,7 +30,7 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/vc1dsp.h" #include "constants.h" -#include "dsputil_x86.h" +#include "fpel.h" #include "vc1dsp.h" #if HAVE_INLINE_ASM |