diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-01 05:33:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-01 05:35:26 +0200 |
| commit | 721be993713550e7f1c3bccf670fd0a1be7e7738 (patch) | |
| tree | 500c5f113ad0092f52bca3bbb9db807d82c4ac92 /tests/fate2.mak | |
| parent | 9251942ca728e7807a2a95306415b27b36a8b8e7 (diff) | |
| parent | be73d76b34481686020e423ccabcca77042d0ede (diff) | |
| download | ffmpeg-721be993713550e7f1c3bccf670fd0a1be7e7738.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: fix some then/than typos
doxygen: Include libavcodec and libavformat examples into the documentation
avutil: elaborate documentation for av_get_random_seed
Add support for aac streams in mp4/mov without extradata.
aes: whitespace cosmetics
adler32: whitespace cosmetics
swscale: fix another yuv range conversion overflow in 16bit scaling.
Fix cpu flags test program
opt-test: Add missing braces to silence compiler warnings.
build: Eliminate obsolete test targets.
udp: Fix a compilation warning
swscale: Unbreak build with --enable-small
base64: add fate test
aes: improve test program and add fate test
adler32: make test program more useful and add fate test
swscale: fix yuv range correction when using 16-bit scaling.
aacenc: Make chan_map const correct
Conflicts:
Makefile
doc/examples/muxing-example.c
libavformat/udp.c
libavutil/random_seed.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate2.mak')
| -rw-r--r-- | tests/fate2.mak | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/fate2.mak b/tests/fate2.mak index b45efdd552..db42135295 100644 --- a/tests/fate2.mak +++ b/tests/fate2.mak @@ -217,6 +217,20 @@ FATE_TESTS += fate-sha fate-sha: libavutil/sha-test$(EXESUF) fate-sha: CMD = run libavutil/sha-test +FATE_TESTS += fate-adler32 +fate-adler32: libavutil/adler32-test$(EXESUF) +fate-adler32: CMD = run libavutil/adler32-test +fate-adler32: REF = /dev/null + +FATE_TESTS += fate-aes +fate-aes: libavutil/aes-test$(EXESUF) +fate-aes: CMD = run libavutil/aes-test +fate-aes: REF = /dev/null + +FATE_TESTS += fate-base64 +fate-base64: libavutil/base64-test$(EXESUF) +fate-base64: CMD = run libavutil/base64-test + FATE_TESTS += fate-musepack7 fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc fate-musepack7: CMP = oneoff |