diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:21:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:33:27 +0100 |
| commit | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (patch) | |
| tree | a5e84b671607fe633568f86d2f5cf8c2dea698db /tests/fate/acodec.mak | |
| parent | 211372e86dbf73505bd981dec7ad755e0623d22d (diff) | |
| parent | e816034a5fa131b13c4ad87bb0b5065b4f5697c6 (diff) | |
| download | ffmpeg-7711f19eda40a7fd1c8a327f1700ffdd115e1667.tar.gz | |
Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'
* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
fate-seek: remove use of gnu make 3.82 only private modifier
fate: move vsynth reference files to their own directory
fate: move fate-acodec reference files to their own dir
configure: avplay now depends on avresample
fate: split dependencies for fate-seek tests
Conflicts:
configure
tests/fate/seek.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/acodec.mak')
| -rw-r--r-- | tests/fate/acodec.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 5397d1aba7..0206486d7a 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -2,6 +2,7 @@ fate-acodec-%: CODEC = $(@:fate-acodec-%=%) fate-acodec-%: SRC = tests/data/asynth-44100-2.wav fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep fate-acodec-%: CMP_UNIT = 2 +fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%) FATE_ACODEC_PCM-$(call ENCDEC, PCM_ALAW, WAV) += alaw FATE_ACODEC_PCM-$(call ENCDEC, PCM_MULAW, WAV) += mulaw |