diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:45:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:00:04 +0200 |
| commit | 191430a28f6aba118471c2704e66b2abd1638b94 (patch) | |
| tree | 58665d3e174585ec7ff7ab43f941e260e92e3334 /tests/fate | |
| parent | 506ebdac2a32e3fe27afd2ff40268c851fc1a817 (diff) | |
| parent | 28663511c99b3cdaf9387a15032259879474f5f4 (diff) | |
Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'
* commit '28663511c99b3cdaf9387a15032259879474f5f4':
fate: Invoke pixdesc lavfi tests through fate-run.sh
Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/avfilter.mak | 1 | ||||
| -rw-r--r-- | tests/fate/filter-video.mak | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak index a0565b6974..4c8c26a876 100644 --- a/tests/fate/avfilter.mak +++ b/tests/fate/avfilter.mak @@ -17,7 +17,6 @@ FATE_LAVFI = fate-lavfi-alphaextract_rgb \ fate-lavfi-pixfmts_hflip \ fate-lavfi-pixfmts_null \ fate-lavfi-pixfmts_pad \ - fate-lavfi-pixfmts_pixdesctest \ fate-lavfi-pixfmts_scale \ fate-lavfi-pixfmts_vflip \ fate-lavfi-select \ diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 12ca955efa..75ac03a6b1 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -94,6 +94,10 @@ FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip" +FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += fate-filter-pixdesc +fate-filter-pixdesc: CMD = pixdesc + + $(FATE_FILTER_VSYNTH-yes): $(VREF) $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm |