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/dct.h | |
| parent | 9e59a7be1cc9bd840d91f78c55b7f4953659319b (diff) | |
| parent | 95c0cec03acec0a80cc1c7db48f3b2355d9e767b (diff) | |
| download | ffmpeg-streaming-5db23c07a3f76d31e8e3178f8bacb68289bba62b.zip ffmpeg-streaming-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/dct.h')
| -rw-r--r-- | libavcodec/dct.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dct.h b/libavcodec/dct.h index 717f21b..05297ba 100644 --- a/libavcodec/dct.h +++ b/libavcodec/dct.h @@ -62,5 +62,7 @@ void ff_j_rev_dct(int16_t *data); void ff_j_rev_dct4(int16_t *data); void ff_j_rev_dct2(int16_t *data); void ff_j_rev_dct1(int16_t *data); +void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block); +void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block); #endif /* AVCODEC_DCT_H */ |
