diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:55:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 22:55:21 +0200 |
| commit | 4cb59ad84b97e50549f22998b2a83d0a1e7f4b97 (patch) | |
| tree | 72b9f769556432e2c39336f152e0975f8e3b8965 /tests/Makefile | |
| parent | f4b05cd8415ad6160900bb00565f9b75e356530e (diff) | |
| parent | 3eec1d41b4a947ba497f528e68da14a8befb85b9 (diff) | |
| download | ffmpeg-4cb59ad84b97e50549f22998b2a83d0a1e7f4b97.tar.gz | |
Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
fate: Reuse VREF and AREF variables where appropriate
Conflicts:
tests/fate/filter.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index 278466687c..c9ebb6efba 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -15,10 +15,10 @@ ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw OBJDIRS += tests/data tests/vsynth1 -tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) | tests/vsynth1 +$(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1 $(M)./$< 'tests/vsynth1/' -tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data +$(AREF): tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data |