diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 23:59:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-28 23:59:15 +0100 |
| commit | 8c1f98d9542d3463f46a3953eb0dd028a1e1b66f (patch) | |
| tree | c71e28f565dc53b276402695ffcc21b95bc0adb9 /tests | |
| parent | 5ddc072d0ddc7af1fc354d58a22108eb4fc53327 (diff) | |
| parent | bb6c67bb36b136de10256f0999128df4a42f9ffc (diff) | |
| download | ffmpeg-8c1f98d9542d3463f46a3953eb0dd028a1e1b66f.tar.gz | |
Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'
* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc':
lavfi: remove vf_slicify
Conflicts:
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_slicify.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavfi-regression.sh | 14 | ||||
| -rw-r--r-- | tests/ref/lavfi/crop_scale_vflip | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index c9e7c6abf9..13c394eef2 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -24,12 +24,12 @@ do_lavfi_plain() { vfilters="$2" if [ $test = $1 ] ; then - do_video_filter $test "$vfilters" + do_video_filter $test "$2" fi } do_lavfi() { - do_lavfi_plain $1 "slicify=random,$2" + do_lavfi_plain $1 "$2" } do_lavfi_colormatrix() { @@ -67,10 +67,10 @@ do_lavfi "vflip" "vflip" do_lavfi "vflip_crop" "vflip,crop=iw-100:ih-100:100:100" do_lavfi "vflip_vflip" "vflip,vflip" -do_lavfi_plain "alphamerge_rgb" "[in]slicify=random,format=bgra,split,alphamerge[out]" -do_lavfi_plain "alphamerge_yuv" "[in]slicify=random,format=yuv420p,split,alphamerge[out]" -do_lavfi_plain "alphaextract_rgb" "[in]slicify=random,format=bgra,split,alphamerge,slicify=random,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" -do_lavfi_plain "alphaextract_yuv" "[in]slicify=random,format=yuv420p,split,alphamerge,slicify=random,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" +do_lavfi_plain "alphamerge_rgb" "[in]format=bgra,split,alphamerge[out]" +do_lavfi_plain "alphamerge_yuv" "[in]format=yuv420p,split,alphamerge[out]" +do_lavfi_plain "alphaextract_rgb" "[in]format=bgra,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" +do_lavfi_plain "alphaextract_yuv" "[in]format=yuv420p,split,alphamerge,split[o3][o4];[o4]alphaextract[alpha];[o3][alpha]alphamerge[out]" do_lavfi_colormatrix "colormatrix" bt709 fcc bt601 smpte240m @@ -101,7 +101,7 @@ do_lavfi_pixfmts(){ pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts) for pix_fmt in $pix_fmts; do - do_video_filter $pix_fmt "slicify=random,format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt + do_video_filter $pix_fmt "format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt done rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts diff --git a/tests/ref/lavfi/crop_scale_vflip b/tests/ref/lavfi/crop_scale_vflip index a1cc0e933d..9a7d326b79 100644 --- a/tests/ref/lavfi/crop_scale_vflip +++ b/tests/ref/lavfi/crop_scale_vflip @@ -1 +1 @@ -crop_scale_vflip b2760ee11238873d6321d0a11cd42d0e +crop_scale_vflip 56b8204e72d0680b139a8d9dd756e332 |