diff options
author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:29:24 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:46 +0200 |
commit | c8e1b2fbc93eaf102994865d730691f5f16f4129 (patch) | |
tree | 81d86220c2ce167291518e5165451093e49fabc5 | |
parent | 873c89e2a6825150edf036fd9993d53f25a0c6b8 (diff) | |
download | ffmpeg-c8e1b2fbc93eaf102994865d730691f5f16f4129.tar.gz |
libavcodec: Add ff_ prefix to j_rev_dct*
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r-- | libavcodec/dct-test.c | 2 | ||||
-rw-r--r-- | libavcodec/dsputil.c | 20 | ||||
-rw-r--r-- | libavcodec/dsputil.h | 8 | ||||
-rw-r--r-- | libavcodec/jrevdct.c | 8 |
4 files changed, 19 insertions, 19 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 7aa2292987..133fdbf0d5 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -110,7 +110,7 @@ static const struct algo fdct_tab[] = { static const struct algo idct_tab[] = { { "FAANI", ff_faanidct, NO_PERM }, { "REF-DBL", ff_ref_idct, NO_PERM }, - { "INT", j_rev_dct, MMX_PERM }, + { "INT", ff_j_rev_dct, MMX_PERM }, { "SIMPLE-C", ff_simple_idct_8, NO_PERM }, #if HAVE_MMX diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index f9d933fe2f..74b8fd7466 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2700,34 +2700,34 @@ static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) } static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block) { - j_rev_dct (block); + ff_j_rev_dct (block); ff_put_pixels_clamped_c(block, dest, line_size); } static void ff_jref_idct_add(uint8_t *dest, int line_size, DCTELEM *block) { - j_rev_dct (block); + ff_j_rev_dct (block); ff_add_pixels_clamped_c(block, dest, line_size); } static void ff_jref_idct4_put(uint8_t *dest, int line_size, DCTELEM *block) { - j_rev_dct4 (block); + ff_j_rev_dct4 (block); put_pixels_clamped4_c(block, dest, line_size); } static void ff_jref_idct4_add(uint8_t *dest, int line_size, DCTELEM *block) { - j_rev_dct4 (block); + ff_j_rev_dct4 (block); add_pixels_clamped4_c(block, dest, line_size); } static void ff_jref_idct2_put(uint8_t *dest, int line_size, DCTELEM *block) { - j_rev_dct2 (block); + ff_j_rev_dct2 (block); put_pixels_clamped2_c(block, dest, line_size); } static void ff_jref_idct2_add(uint8_t *dest, int line_size, DCTELEM *block) { - j_rev_dct2 (block); + ff_j_rev_dct2 (block); add_pixels_clamped2_c(block, dest, line_size); } @@ -2813,17 +2813,17 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) if(avctx->lowres==1){ c->idct_put= ff_jref_idct4_put; c->idct_add= ff_jref_idct4_add; - c->idct = j_rev_dct4; + c->idct = ff_j_rev_dct4; c->idct_permutation_type= FF_NO_IDCT_PERM; }else if(avctx->lowres==2){ c->idct_put= ff_jref_idct2_put; c->idct_add= ff_jref_idct2_add; - c->idct = j_rev_dct2; + c->idct = ff_j_rev_dct2; c->idct_permutation_type= FF_NO_IDCT_PERM; }else if(avctx->lowres==3){ c->idct_put= ff_jref_idct1_put; c->idct_add= ff_jref_idct1_add; - c->idct = j_rev_dct1; + c->idct = ff_j_rev_dct1; c->idct_permutation_type= FF_NO_IDCT_PERM; }else{ if (avctx->bits_per_raw_sample == 10) { @@ -2835,7 +2835,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) if(avctx->idct_algo==FF_IDCT_INT){ c->idct_put= ff_jref_idct_put; c->idct_add= ff_jref_idct_add; - c->idct = j_rev_dct; + c->idct = ff_j_rev_dct; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER ) && avctx->idct_algo==FF_IDCT_VP3){ diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index f79371295f..0a6165685e 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -45,10 +45,10 @@ void ff_jpeg_fdct_islow_10(DCTELEM *data); void ff_fdct248_islow_8(DCTELEM *data); void ff_fdct248_islow_10(DCTELEM *data); -void j_rev_dct (DCTELEM *data); -void j_rev_dct4 (DCTELEM *data); -void j_rev_dct2 (DCTELEM *data); -void j_rev_dct1 (DCTELEM *data); +void ff_j_rev_dct (DCTELEM *data); +void ff_j_rev_dct4 (DCTELEM *data); +void ff_j_rev_dct2 (DCTELEM *data); +void ff_j_rev_dct1 (DCTELEM *data); void ff_wmv2_idct_c(DCTELEM *data); void ff_fdct_mmx(DCTELEM *block); diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevdct.c index 5ed96da2ca..395eb8c638 100644 --- a/libavcodec/jrevdct.c +++ b/libavcodec/jrevdct.c @@ -207,7 +207,7 @@ ones here or successive P-frames will drift too much with Reference frame coding * Perform the inverse DCT on one block of coefficients. */ -void j_rev_dct(DCTBLOCK data) +void ff_j_rev_dct(DCTBLOCK data) { int32_t tmp0, tmp1, tmp2, tmp3; int32_t tmp10, tmp11, tmp12, tmp13; @@ -945,7 +945,7 @@ void j_rev_dct(DCTBLOCK data) #define DCTSIZE 4 #define DCTSTRIDE 8 -void j_rev_dct4(DCTBLOCK data) +void ff_j_rev_dct4(DCTBLOCK data) { int32_t tmp0, tmp1, tmp2, tmp3; int32_t tmp10, tmp11, tmp12, tmp13; @@ -1132,7 +1132,7 @@ void j_rev_dct4(DCTBLOCK data) } } -void j_rev_dct2(DCTBLOCK data){ +void ff_j_rev_dct2(DCTBLOCK data){ int d00, d01, d10, d11; data[0] += 4; @@ -1147,7 +1147,7 @@ void j_rev_dct2(DCTBLOCK data){ data[1+1*DCTSTRIDE]= (d01 - d11)>>3; } -void j_rev_dct1(DCTBLOCK data){ +void ff_j_rev_dct1(DCTBLOCK data){ data[0] = (data[0] + 4)>>3; } |