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/fate/mpc.mak | |
| 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/fate/mpc.mak')
| -rw-r--r-- | tests/fate/mpc.mak | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak index 5505a9aef3..53d236ee22 100644 --- a/tests/fate/mpc.mak +++ b/tests/fate/mpc.mak @@ -1,13 +1,13 @@ -FATE_MPC += fate-mpc7-demux +FATE_MPC-$(CONFIG_MPC_DEMUXER) += fate-mpc7-demux fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy -FATE_MPC += fate-mpc8-demux +FATE_MPC-$(CONFIG_MPC8_DEMUXER) += fate-mpc8-demux fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy -FATE_MPC += fate-musepack7 +FATE_MPC-$(call DEMDEC, MPC, MPC7) += fate-musepack7 fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc fate-musepack7: CMP = oneoff fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm -FATE_SAMPLES_FFMPEG += $(FATE_MPC) -fate-mpc: $(FATE_MPC) +FATE_SAMPLES_AVCONV += $(FATE_MPC-yes) +fate-mpc: $(FATE_MPC-yes) |