Commit dbc9f84e authored by Mans Rullgard's avatar Mans Rullgard

Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."

This reverts commit 484a337c.

These functions were used in f8bed30d "VC1: merge idct8x8, coeff
adjustments and put_pixels" which was reverted in 18b6a69c.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 3d868fe5
...@@ -359,8 +359,8 @@ static void diff_pixels_c(DCTELEM *restrict block, const uint8_t *s1, ...@@ -359,8 +359,8 @@ static void diff_pixels_c(DCTELEM *restrict block, const uint8_t *s1,
} }
void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels, static void put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
int line_size) int line_size)
{ {
int i; int i;
...@@ -380,9 +380,9 @@ void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels, ...@@ -380,9 +380,9 @@ void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
} }
} }
void ff_put_signed_pixels_clamped_c(const DCTELEM *block, static void put_signed_pixels_clamped_c(const DCTELEM *block,
uint8_t *restrict pixels, uint8_t *restrict pixels,
int line_size) int line_size)
{ {
int i, j; int i, j;
...@@ -401,8 +401,8 @@ void ff_put_signed_pixels_clamped_c(const DCTELEM *block, ...@@ -401,8 +401,8 @@ void ff_put_signed_pixels_clamped_c(const DCTELEM *block,
} }
} }
void ff_add_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels, static void add_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
int line_size) int line_size)
{ {
int i; int i;
...@@ -2606,22 +2606,22 @@ void ff_wmv2_idct_c(short * block){ ...@@ -2606,22 +2606,22 @@ void ff_wmv2_idct_c(short * block){
static void ff_wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block) static void ff_wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block)
{ {
ff_wmv2_idct_c(block); ff_wmv2_idct_c(block);
ff_put_pixels_clamped_c(block, dest, line_size); put_pixels_clamped_c(block, dest, line_size);
} }
static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block)
{ {
ff_wmv2_idct_c(block); ff_wmv2_idct_c(block);
ff_add_pixels_clamped_c(block, dest, line_size); add_pixels_clamped_c(block, dest, line_size);
} }
static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block) static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
{ {
ff_j_rev_dct (block); ff_j_rev_dct (block);
ff_put_pixels_clamped_c(block, dest, line_size); put_pixels_clamped_c(block, dest, line_size);
} }
static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block) static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
{ {
ff_j_rev_dct (block); ff_j_rev_dct (block);
ff_add_pixels_clamped_c(block, dest, line_size); add_pixels_clamped_c(block, dest, line_size);
} }
static void just_return(void *mem av_unused, int stride av_unused, int h av_unused) { return; } static void just_return(void *mem av_unused, int stride av_unused, int h av_unused) { return; }
...@@ -2720,9 +2720,9 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) ...@@ -2720,9 +2720,9 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
} }
c->diff_pixels = diff_pixels_c; c->diff_pixels = diff_pixels_c;
c->put_pixels_clamped = ff_put_pixels_clamped_c; c->put_pixels_clamped = put_pixels_clamped_c;
c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_c; c->put_signed_pixels_clamped = put_signed_pixels_clamped_c;
c->add_pixels_clamped = ff_add_pixels_clamped_c; c->add_pixels_clamped = add_pixels_clamped_c;
c->sum_abs_dctelem = sum_abs_dctelem_c; c->sum_abs_dctelem = sum_abs_dctelem_c;
c->gmc1 = gmc1_c; c->gmc1 = gmc1_c;
c->gmc = ff_gmc_c; c->gmc = ff_gmc_c;
......
...@@ -197,10 +197,6 @@ EMULATED_EDGE(8) ...@@ -197,10 +197,6 @@ EMULATED_EDGE(8)
EMULATED_EDGE(9) EMULATED_EDGE(9)
EMULATED_EDGE(10) EMULATED_EDGE(10)
void ff_add_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize);
void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize);
void ff_put_signed_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize);
/** /**
* DSPContext. * DSPContext.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment