diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:28:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:29:05 +0200 |
| commit | 270d3c96ec492e004275fdb7fd625f801fd1a26b (patch) | |
| tree | fd955bf5fb2692736fb7132c02c0b450d06f4e95 /tests | |
| parent | b3fb2d8cec91dadf935832f3bef97bf5a3a11352 (diff) | |
| parent | e2b0edb6ac9ca2713d8f3846dd0ca265815fa6ea (diff) | |
| download | ffmpeg-270d3c96ec492e004275fdb7fd625f801fd1a26b.tar.gz | |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/subtitles: switch to an AVOptions-based system.
lavfi/pp: switch to an AVOptions-based system.
lavfi/geq: switch to an AVOptions-based system.
lavfi/edgedetect: switch to an AVOptions-based system.
lavfi/curves: switch to an AVOptions-based system.
lavfi/colormatrix: switch to an AVOptions-based system.
lavfi/perms: switch to an AVOptions-based system.
lavfi/ebur128: switch to an AVOptions-based system.
lavfi/showspectrum: switch to an AVOptions-based system.
lavfi/silencedetect: switch to an AVOptions-based system.
lavfi/thumbnail: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavfi-regression.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index bb023e4567..9076e4fbda 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -52,8 +52,8 @@ do_lavfi "overlay_yuv420" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1 do_lavfi "overlay_yuv444" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16:format=yuv444" do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" do_lavfi "pp" "pp=be/hb/vb/tn/l5/al" -do_lavfi "pp2" "pp=be/fq:16/h1/v1/lb" -do_lavfi "pp3" "pp=be/fq:8/ha:128:7/va/li" +do_lavfi "pp2" "pp=be/fq|16/h1/v1/lb" +do_lavfi "pp3" "pp=be/fq|8/ha|128|7/va/li" do_lavfi "pp4" "pp=be/ci" do_lavfi "pp5" "pp=md" do_lavfi "pp6" "pp=be/fd" |