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/idctdsp.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/idctdsp.h')
| -rw-r--r-- | libavcodec/idctdsp.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/idctdsp.h b/libavcodec/idctdsp.h index 9df13c5..8d60656 100644 --- a/libavcodec/idctdsp.h +++ b/libavcodec/idctdsp.h @@ -48,11 +48,6 @@ void ff_init_scantable_permutation(uint8_t *idct_permutation, int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, enum idct_permutation_type perm_type); -void ff_put_pixels_clamped(const int16_t *block, uint8_t *av_restrict pixels, - int line_size); -void ff_add_pixels_clamped(const int16_t *block, uint8_t *av_restrict pixels, - int line_size); - typedef struct IDCTDSPContext { /* pixel ops : interface with DCT */ void (*put_pixels_clamped)(const int16_t *block /* align 16 */, @@ -100,6 +95,9 @@ typedef struct IDCTDSPContext { enum idct_permutation_type perm_type; } IDCTDSPContext; +extern void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size); +extern void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size); + void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx); void ff_idctdsp_init_alpha(IDCTDSPContext *c, AVCodecContext *avctx, |
