Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-21 21:48:48 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-11-21 21:49:41 +0400
commita486dec4fd8f2d461ebec5b2744844916c28d383 (patch)
tree321ade3e64fce959df1c005b57e0589ce99c9d43 /tests/fate
parentbc140fb568df9c8ae341bbb2026d3609b7e81d6b (diff)
parent874838dc6589d978611c89a40694a5074f892a76 (diff)
Merge commit '874838dc6589d978611c89a40694a5074f892a76'
* commit '874838dc6589d978611c89a40694a5074f892a76': fate: add one select filter test Conflicts: tests/fate/filter-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/filter-video.mak4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 963bbd72e4..2d9ad132a3 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -81,6 +81,10 @@ fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase
FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields
fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields
+FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select-alternate
+fate-filter-select-alternate: tests/data/filtergraphs/select-alternate
+fate-filter-select-alternate: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/select-alternate
+
FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER SETTB_FILTER) += fate-filter-setpts
fate-filter-setpts: tests/data/filtergraphs/setpts
fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts