diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:47:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-19 13:47:47 +0200 |
| commit | 93f244e3abc3d75a797535a8da890bb1f9932433 (patch) | |
| tree | 8278955c098813fafdf58a5b4011b13f25b7ee03 /tests/Makefile | |
| parent | b0554fec0470bf59b0582c80697d28646e37b854 (diff) | |
| parent | 0af1fe845a9d7112da0a58d33a4fc81fe7c47e95 (diff) | |
| download | ffmpeg-93f244e3abc3d75a797535a8da890bb1f9932433.tar.gz | |
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index a0210c76f0..b5e0443855 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -122,7 +122,8 @@ FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC) FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) -FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) +FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes) +FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) FATE_EXTERN += $(FATE_EXTERN-yes) FATE += $(FATE-yes) |