diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 23:53:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 23:57:00 +0200 |
| commit | 620c6292b1a7cdaaa3e258c899b37e68954589b8 (patch) | |
| tree | cce4c5fcb0a86343dcbb30c116e0b54dc6122309 /libavcodec/fft-test.c | |
| parent | f9c823df13f47d285ed0bd406906e138df4e8ae1 (diff) | |
| parent | 0da29727eadcc4e1f1ed661d1db4caed6ceb17c9 (diff) | |
| download | ffmpeg-620c6292b1a7cdaaa3e258c899b37e68954589b8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix Ogg demuxer dependencies
build: Fix FLAC demuxer dependencies
flac: Move flac functions shared between libraries to flac common code
build: Fix CAF demuxer dependencies
build: Fix MP2 muxer dependencies
build: Add missing build rules for the ISMV muxer
configure: Drop redundant mxf_d10 test dependency declaration
Support AAC encoding via the external library fdk-aac
libavcodec: Add more AAC profiles
dct/fft-test: use a replacement getopt() if the system has none present.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft-test.c')
| -rw-r--r-- | libavcodec/fft-test.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index a385076bee..d9cd8bd1c7 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -34,7 +34,9 @@ #include "rdft.h" #endif #include <math.h> +#if HAVE_UNISTD_H #include <unistd.h> +#endif #include <stdlib.h> #include <string.h> @@ -229,6 +231,10 @@ enum tf_transform { TRANSFORM_DCT, }; +#if !HAVE_GETOPT +#include "compat/getopt.c" +#endif + int main(int argc, char **argv) { FFTComplex *tab, *tab1, *tab_ref; |