summaryrefslogtreecommitdiff
path: root/libavcodec/dct.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-03-19 15:14:17 +0000
committerMans Rullgard <mans@mansr.com>2011-03-19 19:49:18 +0000
commit26f548bb59177cfc8c45ff633dd37b60cfd23edf (patch)
tree1e2f6b7d04f8554c60eb4b562844f1cf21b64b9b /libavcodec/dct.c
parentec10a9ab461b26b96eff7bbbb8623f42d8ee04ad (diff)
downloadffmpeg-26f548bb59177cfc8c45ff633dd37b60cfd23edf.tar.gz
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 <mans@mansr.com>
Diffstat (limited to 'libavcodec/dct.c')
-rw-r--r--libavcodec/dct.c13
1 files changed, 4 insertions, 9 deletions
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;