diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:21:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:21:54 +0100 |
| commit | 74fed968d1b6f0aec9c08b9ac4fcad4314e0460a (patch) | |
| tree | e71ce5a64ad6d1c6287915220e11698aeed8d2f1 /libavcodec/x86/dsputil_x86.h | |
| parent | 816d7936a714b050a86cd376c9dd0c175a6fd9fa (diff) | |
| parent | 82dd1026cfc1d72b04019185bea4c1c9621ace3f (diff) | |
| download | ffmpeg-74fed968d1b6f0aec9c08b9ac4fcad4314e0460a.tar.gz | |
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
x86: dsputil: Move hpeldsp-related declarations to a separate header
Conflicts:
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_x86.h')
| -rw-r--r-- | libavcodec/x86/dsputil_x86.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h index 69850428ad..6a50a09e5d 100644 --- a/libavcodec/x86/dsputil_x86.h +++ b/libavcodec/x86/dsputil_x86.h @@ -22,7 +22,6 @@ #ifndef AVCODEC_X86_DSPUTIL_X86_H #define AVCODEC_X86_DSPUTIL_X86_H -#include <stddef.h> #include <stdint.h> #include "libavcodec/avcodec.h" @@ -66,19 +65,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_x2_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - -void ff_avg_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_avg_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - -void ff_put_pixels8_xy2_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); -void ff_put_pixels16_xy2_mmx(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); - void ff_mmx_idct(int16_t *block); void ff_mmxext_idct(int16_t *block); |