diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-10-29 22:26:01 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-10-29 22:26:01 +0000 |
| commit | 82696beed3bb285c9dfad6aeff4488955644cb49 (patch) | |
| tree | c9b9dac6642463da217bb4caabde9407cf3f62f8 | |
| parent | df8d4d0ed5bb0658006a9349a814c5b220aef09d (diff) | |
| download | ffmpeg-82696beed3bb285c9dfad6aeff4488955644cb49.tar.gz | |
avoid name clash
Originally committed as revision 1104 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dsputil.h | 8 | ||||
| -rw-r--r-- | libavcodec/mdct.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 096dc288c6..2eb8651e87 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -262,11 +262,11 @@ typedef struct MDCTContext { FFTContext fft; } MDCTContext; -int mdct_init(MDCTContext *s, int nbits, int inverse); -void imdct_calc(MDCTContext *s, FFTSample *output, +int ff_mdct_init(MDCTContext *s, int nbits, int inverse); +void ff_imdct_calc(MDCTContext *s, FFTSample *output, const FFTSample *input, FFTSample *tmp); -void mdct_calc(MDCTContext *s, FFTSample *out, +void ff_mdct_calc(MDCTContext *s, FFTSample *out, const FFTSample *input, FFTSample *tmp); -void mdct_end(MDCTContext *s); +void ff_mdct_end(MDCTContext *s); #endif diff --git a/libavcodec/mdct.c b/libavcodec/mdct.c index baab5d3152..0f70ed850c 100644 --- a/libavcodec/mdct.c +++ b/libavcodec/mdct.c @@ -21,7 +21,7 @@ /* * init MDCT or IMDCT computation */ -int mdct_init(MDCTContext *s, int nbits, int inverse) +int ff_mdct_init(MDCTContext *s, int nbits, int inverse) { int n, n4, i; float alpha; @@ -69,8 +69,8 @@ int mdct_init(MDCTContext *s, int nbits, int inverse) * @param input N/2 samples * @param tmp N/2 samples */ -void imdct_calc(MDCTContext *s, FFTSample *output, - const FFTSample *input, FFTSample *tmp) +void ff_imdct_calc(MDCTContext *s, FFTSample *output, + const FFTSample *input, FFTSample *tmp) { int k, n8, n4, n2, n, j; const uint16_t *revtab = s->fft.revtab; @@ -121,8 +121,8 @@ void imdct_calc(MDCTContext *s, FFTSample *output, * @param out N/2 samples * @param tmp temporary storage of N/2 samples */ -void mdct_calc(MDCTContext *s, FFTSample *out, - const FFTSample *input, FFTSample *tmp) +void ff_mdct_calc(MDCTContext *s, FFTSample *out, + const FFTSample *input, FFTSample *tmp) { int i, j, n, n8, n4, n2, n3; FFTSample re, im, re1, im1; @@ -162,7 +162,7 @@ void mdct_calc(MDCTContext *s, FFTSample *out, } } -void mdct_end(MDCTContext *s) +void ff_mdct_end(MDCTContext *s) { av_freep(&s->tcos); av_freep(&s->tsin); |