diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 12:47:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-08 12:47:54 +0200 |
| commit | 9818bbde5303f3618c6f428a3ab75ae916821a5d (patch) | |
| tree | 66e7cc65a9ab114f579f9117235c3dc26481893d /tests | |
| parent | 1aed0513a1c2fdc3b94c9dd165d393bd5513b92a (diff) | |
| parent | e0c53c3408181d2e7d544eb65fc7355a79438dfe (diff) | |
Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
nut: use meaningful error values
FATE: use a less ambiguous end time for filter-trim-time test
Conflicts:
libavformat/nutdec.c
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/filter-video.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 1a0f5d9845..09126cab00 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -83,7 +83,7 @@ FATE_TRIM += fate-filter-trim-mixed fate-filter-trim-mixed: CMD = framecrc -i $(SRC) -vf trim=start=0.2:end=0.4:start_frame=1:end_frame=3 FATE_TRIM += fate-filter-trim-time -fate-filter-trim-time: CMD = framecrc -i $(SRC) -vf trim=0:0.075 +fate-filter-trim-time: CMD = framecrc -i $(SRC) -vf trim=0:0.09 FATE_FILTER_VSYNTH-$(CONFIG_TRIM_FILTER) += $(FATE_TRIM) |