virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vp9dsp: Add missing ff_ prefixes

Browse Source
This commit is contained in:
Timothy Gu 2015-08-21 17:50:19 -07:00
parent e10ef3289d
commit ee4cc80653
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/vp9dsp_template.c
View File

@ -1078,12 +1078,12 @@ def_hor_up(32)
#endif /* BIT_DEPTH != 12 */ #endif /* BIT_DEPTH != 12 */
#if BIT_DEPTH != 8 #if BIT_DEPTH != 8
void vp9dsp_intrapred_init_10(VP9DSPContext *dsp); void ff_vp9dsp_intrapred_init_10(VP9DSPContext *dsp);
#endif #endif
#if BIT_DEPTH != 10 #if BIT_DEPTH != 10
static static
#endif #endif
av_cold void FUNC(vp9dsp_intrapred_init)(VP9DSPContext *dsp) av_cold void FUNC(ff_vp9dsp_intrapred_init)(VP9DSPContext *dsp)
{ {
#define init_intra_pred_bd_aware(tx, sz) \ #define init_intra_pred_bd_aware(tx, sz) \
dsp->intra_pred[tx][TM_VP8_PRED] = tm_##sz##_c; \ dsp->intra_pred[tx][TM_VP8_PRED] = tm_##sz##_c; \
@ -1092,7 +1092,7 @@ av_cold void FUNC(vp9dsp_intrapred_init)(VP9DSPContext *dsp)
dsp->intra_pred[tx][DC_129_PRED] = dc_129_##sz##_c dsp->intra_pred[tx][DC_129_PRED] = dc_129_##sz##_c
#if BIT_DEPTH == 12 #if BIT_DEPTH == 12
vp9dsp_intrapred_init_10(dsp); ff_vp9dsp_intrapred_init_10(dsp);
#define init_intra_pred(tx, sz) \ #define init_intra_pred(tx, sz) \
init_intra_pred_bd_aware(tx, sz) init_intra_pred_bd_aware(tx, sz)
#else #else
@ -2317,15 +2317,15 @@ filter_fn_set(avg)
#undef bilinf_fn_2d #undef bilinf_fn_2d
#if BIT_DEPTH != 8 #if BIT_DEPTH != 8
void vp9dsp_mc_init_10(VP9DSPContext *dsp); void ff_vp9dsp_mc_init_10(VP9DSPContext *dsp);
#endif #endif
#if BIT_DEPTH != 10 #if BIT_DEPTH != 10
static static
#endif #endif
av_cold void FUNC(vp9dsp_mc_init)(VP9DSPContext *dsp) av_cold void FUNC(ff_vp9dsp_mc_init)(VP9DSPContext *dsp)
{ {
#if BIT_DEPTH == 12 #if BIT_DEPTH == 12
vp9dsp_mc_init_10(dsp); ff_vp9dsp_mc_init_10(dsp);
#else /* BIT_DEPTH == 12 */ #else /* BIT_DEPTH == 12 */
#define init_fpel(idx1, idx2, sz, type) \ #define init_fpel(idx1, idx2, sz, type) \
@ -2555,12 +2555,12 @@ scaled_filter_fn_set(avg)
#undef scaled_bilinf_fn #undef scaled_bilinf_fn
#if BIT_DEPTH != 8 #if BIT_DEPTH != 8
void vp9dsp_scaled_mc_init_10(VP9DSPContext *dsp); void ff_vp9dsp_scaled_mc_init_10(VP9DSPContext *dsp);
#endif #endif
#if BIT_DEPTH != 10 #if BIT_DEPTH != 10
static static
#endif #endif
av_cold void FUNC(vp9dsp_scaled_mc_init)(VP9DSPContext *dsp) av_cold void FUNC(ff_vp9dsp_scaled_mc_init)(VP9DSPContext *dsp)
{ {
#define init_scaled_bd_aware(idx1, idx2, sz, type) \ #define init_scaled_bd_aware(idx1, idx2, sz, type) \
dsp->smc[idx1][FILTER_8TAP_SMOOTH ][idx2] = type##_scaled_smooth_##sz##_c; \ dsp->smc[idx1][FILTER_8TAP_SMOOTH ][idx2] = type##_scaled_smooth_##sz##_c; \
@ -2568,7 +2568,7 @@ av_cold void FUNC(vp9dsp_scaled_mc_init)(VP9DSPContext *dsp)
dsp->smc[idx1][FILTER_8TAP_SHARP ][idx2] = type##_scaled_sharp_##sz##_c dsp->smc[idx1][FILTER_8TAP_SHARP ][idx2] = type##_scaled_sharp_##sz##_c
#if BIT_DEPTH == 12 #if BIT_DEPTH == 12
vp9dsp_scaled_mc_init_10(dsp); ff_vp9dsp_scaled_mc_init_10(dsp);
#define init_scaled(a,b,c,d) init_scaled_bd_aware(a,b,c,d) #define init_scaled(a,b,c,d) init_scaled_bd_aware(a,b,c,d)
#else #else
#define init_scaled(idx1, idx2, sz, type) \ #define init_scaled(idx1, idx2, sz, type) \
@ -2593,9 +2593,9 @@ av_cold void FUNC(vp9dsp_scaled_mc_init)(VP9DSPContext *dsp)
av_cold void FUNC(ff_vp9dsp_init)(VP9DSPContext *dsp) av_cold void FUNC(ff_vp9dsp_init)(VP9DSPContext *dsp)
{ {
FUNC(vp9dsp_intrapred_init)(dsp); FUNC(ff_vp9dsp_intrapred_init)(dsp);
vp9dsp_itxfm_init(dsp); vp9dsp_itxfm_init(dsp);
vp9dsp_loopfilter_init(dsp); vp9dsp_loopfilter_init(dsp);
FUNC(vp9dsp_mc_init)(dsp); FUNC(ff_vp9dsp_mc_init)(dsp);
FUNC(vp9dsp_scaled_mc_init)(dsp); FUNC(ff_vp9dsp_scaled_mc_init)(dsp);
} }