har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

Browse Source 
* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-23 00:29:06 +02:00
commit 9515d7c629
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/fft-test.c
View File

@ -187,7 +187,7 @@ static void dct_ref(FFTSample *output, FFTSample *input, int nbits)
} }
} }
#endif /* CONFIG_DCT */ #endif /* CONFIG_DCT */
#endif #endif /* FFT_FLOAT */
static FFTSample frandom(AVLFG *prng) static FFTSample frandom(AVLFG *prng)
@ -258,7 +258,7 @@ int main(int argc, char **argv)
RDFTContext r1, *r = &r1; RDFTContext r1, *r = &r1;
DCTContext d1, *d = &d1; DCTContext d1, *d = &d1;
int fft_size_2; int fft_size_2;
#endif #endif /* FFT_FLOAT */
int fft_nbits, fft_size; int fft_nbits, fft_size;
double scale = 1.0; double scale = 1.0;
AVLFG prng; AVLFG prng;
@ -350,7 +350,7 @@ int main(int argc, char **argv)
ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II); ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II);
break; break;
# endif /* CONFIG_DCT */ # endif /* CONFIG_DCT */
#endif #endif /* FFT_FLOAT */
default: default:
av_log(NULL, AV_LOG_ERROR, "Requested transform not supported\n"); av_log(NULL, AV_LOG_ERROR, "Requested transform not supported\n");
return 1; return 1;
@ -437,7 +437,7 @@ int main(int argc, char **argv)
err = check_diff((float *)tab_ref, (float *)tab, fft_size, 1.0); err = check_diff((float *)tab_ref, (float *)tab, fft_size, 1.0);
break; break;
#endif /* CONFIG_DCT */ #endif /* CONFIG_DCT */
#endif #endif /* FFT_FLOAT */
} }
/* do a speed test */ /* do a speed test */
@ -473,7 +473,7 @@ int main(int argc, char **argv)
memcpy(tab2, tab1, fft_size * sizeof(FFTSample)); memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
d->dct_calc(d, tab2); d->dct_calc(d, tab2);
break; break;
#endif #endif /* FFT_FLOAT */
} }
} }
duration = av_gettime_relative() - time_start; duration = av_gettime_relative() - time_start;
@ -507,7 +507,7 @@ int main(int argc, char **argv)
ff_dct_end(d); ff_dct_end(d);
break; break;
# endif /* CONFIG_DCT */ # endif /* CONFIG_DCT */
#endif #endif /* FFT_FLOAT */
} }
av_free(tab); av_free(tab);