diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 05:21:08 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 05:33:27 +0400 |
| commit | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (patch) | |
| tree | a5e84b671607fe633568f86d2f5cf8c2dea698db /tests/fate/vcodec.mak | |
| parent | 211372e86dbf73505bd981dec7ad755e0623d22d (diff) | |
| parent | e816034a5fa131b13c4ad87bb0b5065b4f5697c6 (diff) | |
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/vcodec.mak')
| -rw-r--r-- | tests/fate/vcodec.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index a0fcedfd05..6995c4a230 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -4,6 +4,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 +fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv |