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/fft.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/fft.c')
| -rw-r--r-- | libavcodec/fft.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/fft.c b/libavcodec/fft.c index 0768f23045..84d236d558 100644 --- a/libavcodec/fft.c +++ b/libavcodec/fft.c @@ -65,8 +65,8 @@ COSTABLE_CONST FFTSample * const FFT_NAME(ff_cos_tabs)[] = { FFT_NAME(ff_cos_65536), }; -static void ff_fft_permute_c(FFTContext *s, FFTComplex *z); -static void ff_fft_calc_c(FFTContext *s, FFTComplex *z); +static void fft_permute_c(FFTContext *s, FFTComplex *z); +static void fft_calc_c(FFTContext *s, FFTComplex *z); static int split_radix_permutation(int i, int n, int inverse) { @@ -149,8 +149,8 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) s->inverse = inverse; s->fft_permutation = FF_FFT_PERM_DEFAULT; - s->fft_permute = ff_fft_permute_c; - s->fft_calc = ff_fft_calc_c; + s->fft_permute = fft_permute_c; + s->fft_calc = fft_calc_c; #if CONFIG_MDCT s->imdct_calc = ff_imdct_calc_c; s->imdct_half = ff_imdct_half_c; @@ -190,7 +190,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) return -1; } -static void ff_fft_permute_c(FFTContext *s, FFTComplex *z) +static void fft_permute_c(FFTContext *s, FFTComplex *z) { int j, np; const uint16_t *revtab = s->revtab; @@ -347,7 +347,7 @@ static void (* const fft_dispatch[])(FFTComplex*) = { fft2048, fft4096, fft8192, fft16384, fft32768, fft65536, }; -static void ff_fft_calc_c(FFTContext *s, FFTComplex *z) +static void fft_calc_c(FFTContext *s, FFTComplex *z) { fft_dispatch[s->nbits-2](z); } |