virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

avoid name clash

Browse Source 
Originally committed as revision 1104 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-10-29 22:26:01 +00:00
parent df8d4d0ed5
commit 82696beed3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dsputil.h
View File

@ -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

12
libavcodec/mdct.c
View File

@ -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);