diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-27 01:19:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-27 01:19:18 +0100 |
| commit | 49b909b980eb18f1049d9b31ee99f177c58165ae (patch) | |
| tree | cab8d8d6d658aaeeffb2a765b4bda6aa310406bb /tests/Makefile | |
| parent | f51469538f239bcfc1bb2ee697d25d91a8b4b39d (diff) | |
| parent | 723c35feb0d913e07e7f5a3b6be94cb0b79fd086 (diff) | |
| download | ffmpeg-49b909b980eb18f1049d9b31ee99f177c58165ae.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split off vqf/twinvq FATE tests into their own file
fate: split off mpc FATE tests into their own file
fate: split off libavcodec FATE tests into their own file
fate: split off Microsoft codec FATE tests into their own file
fate: group all VP* codec FATE tests together in one file
swscale: prevent invalid writes in packed_16bpc_bswap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 6ac49283a0..04a29968a7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -54,18 +54,22 @@ include $(SRC_PATH)/tests/fate/fft.mak include $(SRC_PATH)/tests/fate/h264.mak include $(SRC_PATH)/tests/fate/image.mak include $(SRC_PATH)/tests/fate/indeo.mak +include $(SRC_PATH)/tests/fate/libavcodec.mak include $(SRC_PATH)/tests/fate/libavutil.mak include $(SRC_PATH)/tests/fate/mapchan.mak include $(SRC_PATH)/tests/fate/lossless-audio.mak include $(SRC_PATH)/tests/fate/lossless-video.mak +include $(SRC_PATH)/tests/fate/microsoft.mak include $(SRC_PATH)/tests/fate/mp3.mak +include $(SRC_PATH)/tests/fate/mpc.mak include $(SRC_PATH)/tests/fate/prores.mak include $(SRC_PATH)/tests/fate/qtrle.mak include $(SRC_PATH)/tests/fate/real.mak include $(SRC_PATH)/tests/fate/screen.mak include $(SRC_PATH)/tests/fate/utvideo.mak include $(SRC_PATH)/tests/fate/vorbis.mak -include $(SRC_PATH)/tests/fate/vp8.mak +include $(SRC_PATH)/tests/fate/vpx.mak +include $(SRC_PATH)/tests/fate/vqf.mak include $(SRC_PATH)/tests/fate/wma.mak FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%) |