From 26f548bb59177cfc8c45ff633dd37b60cfd23edf Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 19 Mar 2011 15:14:17 +0000 Subject: fft: remove inline wrappers for function pointers This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard --- libavcodec/dct.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libavcodec/dct.c') diff --git a/libavcodec/dct.c b/libavcodec/dct.c index 5f45b13fa8..6bafdc1136 100644 --- a/libavcodec/dct.c +++ b/libavcodec/dct.c @@ -59,7 +59,7 @@ static void ff_dst_calc_I_c(DCTContext *ctx, FFTSample *data) } data[n/2] *= 2; - ff_rdft_calc(&ctx->rdft, data); + ctx->rdft.rdft_calc(&ctx->rdft, data); data[0] *= 0.5f; @@ -93,7 +93,7 @@ static void ff_dct_calc_I_c(DCTContext *ctx, FFTSample *data) data[n - i] = tmp1 + s; } - ff_rdft_calc(&ctx->rdft, data); + ctx->rdft.rdft_calc(&ctx->rdft, data); data[n] = data[1]; data[1] = next; @@ -121,7 +121,7 @@ static void ff_dct_calc_III_c(DCTContext *ctx, FFTSample *data) data[1] = 2 * next; - ff_rdft_calc(&ctx->rdft, data); + ctx->rdft.rdft_calc(&ctx->rdft, data); for (i = 0; i < n / 2; i++) { float tmp1 = data[i ] * inv_n; @@ -152,7 +152,7 @@ static void ff_dct_calc_II_c(DCTContext *ctx, FFTSample *data) data[n-i-1] = tmp1 - s; } - ff_rdft_calc(&ctx->rdft, data); + ctx->rdft.rdft_calc(&ctx->rdft, data); next = data[1] * 0.5; data[1] *= -1; @@ -176,11 +176,6 @@ static void dct32_func(DCTContext *ctx, FFTSample *data) ctx->dct32(data, data); } -void ff_dct_calc(DCTContext *s, FFTSample *data) -{ - s->dct_calc(s, data); -} - av_cold int ff_dct_init(DCTContext *s, int nbits, enum DCTTransformType inverse) { int n = 1 << nbits; -- cgit v1.2.3