Browse Source

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

This reverts commit 484a337cd7.

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>
tags/n1.0
Mans Rullgard 12 years ago
parent
commit
dbc9f84ea6
2 changed files with 14 additions and 18 deletions
  1. +14
    -14
      libavcodec/dsputil.c
  2. +0
    -4
      libavcodec/dsputil.h

+ 14
- 14
libavcodec/dsputil.c View File

@@ -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; 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; 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; 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) 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)
} }


c->diff_pixels = diff_pixels_c; 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->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;


+ 0
- 4
libavcodec/dsputil.h View File

@@ -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.
*/ */


Loading…
Cancel
Save