diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-20 22:18:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-20 22:18:26 +0200 |
| commit | 3194ab78a6c4ea0a4c60c91c4d0ea34028ca408f (patch) | |
| tree | 13f41910a7e4feec8d64182bf3b6772d88236098 /tests/Makefile | |
| parent | 9b1f776d751472e8a376b412d02a96a35044e2a0 (diff) | |
| parent | b0e9edc44f1722787adacbff9aa60343206a58c0 (diff) | |
| download | ffmpeg-3194ab78a6c4ea0a4c60c91c4d0ea34028ca408f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: add a cook parser to get subpacket duration
FATE: allow lavf tests to alter input parameters
FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
FATE: replace the acodec-g726 test with 4 new encode/decode tests
FATE: replace current g722 encoding tests with an encode/decode test
FATE: add a pattern rule for generating asynth wav files
FATE: optionally write a WAVE header in audiogen
avutil: add audio fifo buffer
Conflicts:
doc/APIchanges
libavcodec/version.h
libavutil/avutil.h
tests/Makefile
tests/codec-regression.sh
tests/fate/voice.mak
tests/lavf-regression.sh
tests/ref/acodec/g722
tests/ref/acodec/g726
tests/ref/acodec/pcm_s24daud
tests/ref/lavf/dv_fmt
tests/ref/lavf/gxf
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10
tests/ref/seek/lavf_dv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 1a94663c50..9b88c06f82 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -29,6 +29,9 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ 16000 1 +tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data + $(M)./$< $@ $(subst -, ,$*) + tests/data/mapchan-6ch.sw: tests/audiogen$(HOSTEXESUF) @mkdir -p tests/data $(M)./$< $@ 22050 6 @@ -37,7 +40,7 @@ tests/data/mapchan-mono.sw: tests/audiogen$(HOSTEXESUF) @mkdir -p tests/data $(M)./$< $@ 22050 1 -tests/data/%.sw tests/vsynth%/00.pgm: TAG = GEN +tests/data/%.sw tests/data/asynth% tests/vsynth%/00.pgm: TAG = GEN include $(SRC_PATH)/tests/fate/aac.mak include $(SRC_PATH)/tests/fate/ac3.mak |