diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:16:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:16:32 +0200 |
| commit | 04fa81877913798bf4badfa472c8653219f2aeb1 (patch) | |
| tree | 875c341ee83d0b4916b59a40fad7e4a58c9aeac4 /libavcodec/dsputil.c | |
| parent | cae8f469fee7c32685f04a2b507251119d6875ef (diff) | |
| parent | 088f38a4f9f54bb923405c67c9e72d96d90aa284 (diff) | |
Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'
* commit '088f38a4f9f54bb923405c67c9e72d96d90aa284':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.c')
| -rw-r--r-- | libavcodec/dsputil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index d1e466a8f7..5ff5b9059b 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2598,12 +2598,12 @@ static void vector_clip_int32_c(int32_t *dst, const int32_t *src, int32_t min, } while (len > 0); } -static void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block) +static void jref_idct_put(uint8_t *dest, int line_size, int16_t *block) { ff_j_rev_dct (block); put_pixels_clamped_c(block, dest, line_size); } -static void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block) +static void jref_idct_add(uint8_t *dest, int line_size, int16_t *block) { ff_j_rev_dct (block); add_pixels_clamped_c(block, dest, line_size); @@ -2719,8 +2719,8 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->idct_permutation_type = FF_NO_IDCT_PERM; } else { if(avctx->idct_algo==FF_IDCT_INT){ - c->idct_put= ff_jref_idct_put; - c->idct_add= ff_jref_idct_add; + c->idct_put= jref_idct_put; + c->idct_add= jref_idct_add; c->idct = ff_j_rev_dct; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; }else if(avctx->idct_algo==FF_IDCT_FAAN){ |