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/jrevdct.c | |
| 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/jrevdct.c')
| -rw-r--r-- | libavcodec/jrevdct.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c index d4e6571acc..55a7392e98 100644 --- a/libavcodec/jrevdct.c +++ b/libavcodec/jrevdct.c @@ -63,7 +63,9 @@ */ #include "libavutil/common.h" + #include "dct.h" +#include "idctdsp.h" #define EIGHT_BIT_SAMPLES @@ -1153,3 +1155,15 @@ void ff_j_rev_dct1(DCTBLOCK data){ #undef FIX #undef CONST_BITS + +void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block) +{ + ff_j_rev_dct(block); + ff_put_pixels_clamped(block, dest, line_size); +} + +void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block) +{ + ff_j_rev_dct(block); + ff_add_pixels_clamped(block, dest, line_size); +} |