diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-14 21:49:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-14 22:37:43 +0200 |
| commit | 7432bcfe5a36331502c49fe03aefe39b9936247a (patch) | |
| tree | 398b1874abbd4bcf7c103738ac4548e830af0a43 /tests/lavfi-regression.sh | |
| parent | 01bf2ad7351fdaa2e21b6bdf963d22d6ffccb920 (diff) | |
| parent | 7bf9e3391fa21d90ff283fc03a12287fe73db9e8 (diff) | |
| download | ffmpeg-7432bcfe5a36331502c49fe03aefe39b9936247a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vsrc_buffer: fix check from 7ae7c41.
libxvid: Reorder functions to avoid forward declarations; make functions static.
libxvid: drop some pointless dead code
wmal: vertical alignment cosmetics
wmal: Warn about missing bitstream splicing feature and ask for sample.
wmal: Skip seekable_frame_in_packet.
wmal: Drop unused variable num_possible_block_size.
avfiltergraph: make the AVFilterInOut alloc/free API public
graphparser: allow specifying sws flags in the graph description.
graphparser: fix the order of connecting unlabeled links.
graphparser: add avfilter_graph_parse2().
vsrc_buffer: allow using a NULL buffer to signal EOF.
swscale: handle last pixel if lines have an odd width.
qdm2: fix a dubious pointer cast
WMAL: Do not try to read rawpcm coefficients if bits is invalid
mov: Fix detecting there is no sync sample.
tiffdec: K&R cosmetics
avf: has_duration does not check the global one
dsputil: fix optimized emu_edge function on Win64.
Conflicts:
doc/APIchanges
libavcodec/libxvid_rc.c
libavcodec/libxvidff.c
libavcodec/tiff.c
libavcodec/wmalosslessdec.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
libavfilter/vsrc_buffer.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/lavfi-regression.sh')
| -rwxr-xr-x | tests/lavfi-regression.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lavfi-regression.sh b/tests/lavfi-regression.sh index 4857839fda..4d669f2d3c 100755 --- a/tests/lavfi-regression.sh +++ b/tests/lavfi-regression.sh @@ -40,7 +40,7 @@ do_lavfi "crop_vflip" "crop=iw-100:ih-100:100:100,vflip" do_lavfi "drawbox" "drawbox=224:24:88:72:#FF8010@0.5" do_lavfi "fade" "fade=in:5:15,fade=out:30:15" do_lavfi "null" "null" -do_lavfi "overlay" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo,[o2]overlay=240:16" +do_lavfi "overlay" "split[m],scale=88:72,pad=96:80:4:4[o2];[m]fifo[o1],[o1][o2]overlay=240:16" do_lavfi "pad" "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" do_lavfi "pp" "mp=pp=be/de/tn/l5/al" do_lavfi "pp2" "mp=pp=be/fq:16/fa/lb" |