diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
| commit | c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e (patch) | |
| tree | 2c2e94db251ff485d92f4ee81396342265132b9b /tests/fate/audio.mak | |
| parent | cd6f5c4895c49b483542030324ea5198521ab28b (diff) | |
| parent | 4b895cb294d610fb3bf9e57385e665488e8a9ffa (diff) | |
| download | ffmpeg-c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: sanitize linking of tools and test programs
fate: Refactor setting of environment variables for groups of tests
Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/audio.mak')
| -rw-r--r-- | tests/fate/audio.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index ca26f5cc4c..44b0c24db2 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -1,15 +1,15 @@ FATE_BINKAUDIO += fate-binkaudio-dct fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik -fate-binkaudio-dct: CMP = oneoff fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm fate-binkaudio-dct: FUZZ = 2 FATE_BINKAUDIO += fate-binkaudio-rdft fate-binkaudio-rdft: CMD = pcm -i $(SAMPLES)/bink/binkaudio_rdft.bik -fate-binkaudio-rdft: CMP = oneoff fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm fate-binkaudio-rdft: FUZZ = 2 +$(FATE_BINKAUDIO): CMP = oneoff + FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO) fate-binkaudio: $(FATE_BINKAUDIO) |