diff options
| author | James Almer <jamrial@gmail.com> | 2014-08-12 20:19:24 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 01:44:41 +0200 |
| commit | a8592db9bb787e6cd3aece69ce211cb97bd718cd (patch) | |
| tree | 88cfb6785aac4b7a057fb5882e9bc42897d62c41 /libavcodec/arm | |
| parent | 0081a14e7d1e44536400df19ad6c9ea8118db2e9 (diff) | |
| download | ffmpeg-a8592db9bb787e6cd3aece69ce211cb97bd718cd.tar.gz | |
avcodec/idctdsp: make add/put_pixels_clamped_c internal functions
This reduces code duplication and differences with the fork.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/idctdsp_init_arm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/arm/idctdsp_init_arm.c b/libavcodec/arm/idctdsp_init_arm.c index 578697e88e..0a983bfac4 100644 --- a/libavcodec/arm/idctdsp_init_arm.c +++ b/libavcodec/arm/idctdsp_init_arm.c @@ -30,8 +30,8 @@ #include "idctdsp_arm.h" /* XXX: local hack */ -static void (*ff_put_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size); -static void (*ff_add_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size); +static void (*put_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size); +static void (*add_pixels_clamped)(const int16_t *block, uint8_t *pixels, int line_size); void ff_add_pixels_clamped_arm(const int16_t *block, uint8_t *dest, int line_size); @@ -41,25 +41,25 @@ void ff_add_pixels_clamped_arm(const int16_t *block, uint8_t *dest, static void j_rev_dct_arm_put(uint8_t *dest, int line_size, int16_t *block) { ff_j_rev_dct_arm(block); - ff_put_pixels_clamped(block, dest, line_size); + put_pixels_clamped(block, dest, line_size); } static void j_rev_dct_arm_add(uint8_t *dest, int line_size, int16_t *block) { ff_j_rev_dct_arm(block); - ff_add_pixels_clamped(block, dest, line_size); + add_pixels_clamped(block, dest, line_size); } static void simple_idct_arm_put(uint8_t *dest, int line_size, int16_t *block) { ff_simple_idct_arm(block); - ff_put_pixels_clamped(block, dest, line_size); + put_pixels_clamped(block, dest, line_size); } static void simple_idct_arm_add(uint8_t *dest, int line_size, int16_t *block) { ff_simple_idct_arm(block); - ff_add_pixels_clamped(block, dest, line_size); + add_pixels_clamped(block, dest, line_size); } av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx, @@ -67,8 +67,8 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx, { int cpu_flags = av_get_cpu_flags(); - ff_put_pixels_clamped = c->put_pixels_clamped; - ff_add_pixels_clamped = c->add_pixels_clamped; + put_pixels_clamped = c->put_pixels_clamped; + add_pixels_clamped = c->add_pixels_clamped; if (!avctx->lowres && !high_bit_depth) { if ((avctx->idct_algo == FF_IDCT_AUTO && !(avctx->flags & CODEC_FLAG_BITEXACT)) || |