compile fixes

Originally committed as revision 1411 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-01-07 17:43:50 +00:00
parent e1958604fd
commit ea0f841a54
1 changed files with 6 additions and 27 deletions

View File

@ -6,27 +6,6 @@
int mm_flags; int mm_flags;
void *av_malloc(int size)
{
void *ptr;
ptr = malloc(size);
return ptr;
}
void av_free(void *ptr)
{
/* XXX: this test should not be needed on most libcs */
if (ptr)
free(ptr);
}
/* cannot call it directly because of 'void **' casting is not automatic */
void __av_freep(void **ptr)
{
av_free(*ptr);
*ptr = NULL;
}
/* reference fft */ /* reference fft */
#define MUL16(a,b) ((a) * (b)) #define MUL16(a,b) ((a) * (b))
@ -209,7 +188,7 @@ int main(int argc, char **argv)
printf("IMDCT"); printf("IMDCT");
else else
printf("MDCT"); printf("MDCT");
mdct_init(m, fft_nbits, do_inverse); ff_mdct_init(m, fft_nbits, do_inverse);
} else { } else {
if (do_inverse) if (do_inverse)
printf("IFFT"); printf("IFFT");
@ -233,12 +212,12 @@ int main(int argc, char **argv)
if (do_mdct) { if (do_mdct) {
if (do_inverse) { if (do_inverse) {
imdct_ref((float *)tab_ref, (float *)tab1, fft_size); imdct_ref((float *)tab_ref, (float *)tab1, fft_size);
imdct_calc(m, tab2, (float *)tab1, tabtmp); ff_imdct_calc(m, tab2, (float *)tab1, tabtmp);
check_diff((float *)tab_ref, tab2, fft_size); check_diff((float *)tab_ref, tab2, fft_size);
} else { } else {
mdct_ref((float *)tab_ref, (float *)tab1, fft_size); mdct_ref((float *)tab_ref, (float *)tab1, fft_size);
mdct_calc(m, tab2, (float *)tab1, tabtmp); ff_mdct_calc(m, tab2, (float *)tab1, tabtmp);
check_diff((float *)tab_ref, tab2, fft_size / 2); check_diff((float *)tab_ref, tab2, fft_size / 2);
} }
@ -265,9 +244,9 @@ int main(int argc, char **argv)
for(it=0;it<nb_its;it++) { for(it=0;it<nb_its;it++) {
if (do_mdct) { if (do_mdct) {
if (do_inverse) { if (do_inverse) {
imdct_calc(m, (float *)tab, (float *)tab1, tabtmp); ff_imdct_calc(m, (float *)tab, (float *)tab1, tabtmp);
} else { } else {
mdct_calc(m, (float *)tab, (float *)tab1, tabtmp); ff_mdct_calc(m, (float *)tab, (float *)tab1, tabtmp);
} }
} else { } else {
memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
@ -286,7 +265,7 @@ int main(int argc, char **argv)
} }
if (do_mdct) { if (do_mdct) {
mdct_end(m); ff_mdct_end(m);
} else { } else {
fft_end(s); fft_end(s);
} }