aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dsputil.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-08-25 12:34:55 +0100
committerMans Rullgard <mans@mansr.com>2012-08-27 22:24:05 +0100
commitdbc9f84ea6723c3d73dc9ec2aebacabc99a8d949 (patch)
tree7e9543b008eb70d6644a431e3cf0447e5bea8db4 /libavcodec/dsputil.c
parent3d868fe542e3f960f54d18c4baf87fc8e36c497c (diff)
downloadffmpeg-dbc9f84ea6723c3d73dc9ec2aebacabc99a8d949.tar.gz
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
This reverts commit 484a337cd7cd8bb180c4a1bd3321881f1c874a92. These functions were used in f8bed30 "VC1: merge idct8x8, coeff adjustments and put_pixels" which was reverted in 18b6a69. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r--libavcodec/dsputil.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index e754ffe2f8..c78fe40c72 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -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,
- int line_size)
+static void put_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
+ int line_size)
{
int i;
@@ -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,
- uint8_t *restrict pixels,
- int line_size)
+static void put_signed_pixels_clamped_c(const DCTELEM *block,
+ uint8_t *restrict pixels,
+ int line_size)
{
int i, j;
@@ -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,
- int line_size)
+static void add_pixels_clamped_c(const DCTELEM *block, uint8_t *restrict pixels,
+ int line_size)
{
int i;
@@ -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)
{
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)
{
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)
{
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)
{
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; }
@@ -2720,9 +2720,9 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
}
c->diff_pixels = diff_pixels_c;
- c->put_pixels_clamped = ff_put_pixels_clamped_c;
- c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_c;
- c->add_pixels_clamped = ff_add_pixels_clamped_c;
+ c->put_pixels_clamped = put_pixels_clamped_c;
+ c->put_signed_pixels_clamped = put_signed_pixels_clamped_c;
+ c->add_pixels_clamped = add_pixels_clamped_c;
c->sum_abs_dctelem = sum_abs_dctelem_c;
c->gmc1 = gmc1_c;
c->gmc = ff_gmc_c;