diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 15:24:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 15:26:53 +0100 |
| commit | aa36dcf53441a0835f45bc8667de9b157f064809 (patch) | |
| tree | b39aef9cf7c13f2acef06cca44ea9b16b710d1c4 /tests/Makefile | |
| parent | 3f9e2aad34513597a2265478e8eb6c0c8a2eba6c (diff) | |
| parent | 04ffd2203065b4bc6b85dfc3c7c8e14c98e40943 (diff) | |
| download | ffmpeg-aa36dcf53441a0835f45bc8667de9b157f064809.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add xvid test for custom matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index a75401ce66..ff5fc2b34d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -135,6 +135,7 @@ include $(SRC_PATH)/tests/fate/vpx.mak include $(SRC_PATH)/tests/fate/vqf.mak include $(SRC_PATH)/tests/fate/wavpack.mak include $(SRC_PATH)/tests/fate/wma.mak +include $(SRC_PATH)/tests/fate/xvid.mak FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) |