diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-01-01 18:20:55 +0100 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-01-01 23:48:41 +0100 |
| commit | 98ce9b84681bd4b8679bb25889e8f487c35e3ed3 (patch) | |
| tree | a582bc52ad659908718552b58f62a2a3e68299e4 /tests/Makefile | |
| parent | 102cf964ddc97b5ee4a5fe194794ae594617bfaf (diff) | |
| download | ffmpeg-98ce9b84681bd4b8679bb25889e8f487c35e3ed3.tar.gz | |
fate: merge mapchan and options into ffmpeg.
They were two very short files that cover ffmpeg-specific features.
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index f1472f3547..c5cd3a7706 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -81,6 +81,7 @@ include $(SRC_PATH)/tests/fate/demux.mak include $(SRC_PATH)/tests/fate/dfa.mak include $(SRC_PATH)/tests/fate/dpcm.mak include $(SRC_PATH)/tests/fate/ea.mak +include $(SRC_PATH)/tests/fate/ffmpeg.mak include $(SRC_PATH)/tests/fate/ffprobe.mak include $(SRC_PATH)/tests/fate/filter.mak include $(SRC_PATH)/tests/fate/flac.mak @@ -91,13 +92,11 @@ include $(SRC_PATH)/tests/fate/indeo.mak include $(SRC_PATH)/tests/fate/libavcodec.mak include $(SRC_PATH)/tests/fate/libavformat.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/options.mak include $(SRC_PATH)/tests/fate/pcm.mak include $(SRC_PATH)/tests/fate/probe.mak include $(SRC_PATH)/tests/fate/prores.mak |