diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:18:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:19:40 +0200 |
| commit | 5db23c07a3f76d31e8e3178f8bacb68289bba62b (patch) | |
| tree | e798d3c254a0cc5a38b7e5f78864326919516602 /libavcodec/x86 | |
| parent | 9e59a7be1cc9bd840d91f78c55b7f4953659319b (diff) | |
| parent | 95c0cec03acec0a80cc1c7db48f3b2355d9e767b (diff) | |
| download | ffmpeg-5db23c07a3f76d31e8e3178f8bacb68289bba62b.tar.gz | |
Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'
* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
idctdsp: Add global function pointers for {add|put}_pixels_clamped functions
Conflicts:
libavcodec/arm/idctdsp_init_arm.c
libavcodec/dct.h
libavcodec/idctdsp.c
libavcodec/jrevdct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/simple_idct.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c index 6b4bd1852e..1d46212a13 100644 --- a/libavcodec/x86/simple_idct.c +++ b/libavcodec/x86/simple_idct.c @@ -22,6 +22,9 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" + +#include "libavcodec/idctdsp.h" + #include "idctdsp.h" #include "simple_idct.h" @@ -1159,12 +1162,12 @@ void ff_simple_idct_mmx(int16_t *block) void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block) { idct(block); - ff_put_pixels_clamped_mmx(block, dest, line_size); + ff_put_pixels_clamped(block, dest, line_size); } void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block) { idct(block); - ff_add_pixels_clamped_mmx(block, dest, line_size); + ff_add_pixels_clamped(block, dest, line_size); } #endif /* HAVE_INLINE_ASM */ |