Michael Niedermayer 8c1f98d954 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>

2012-11-28 23:59:15 +01:00

..

fate

fate: add ADPCM IMA Dialogic OKI decoder test

2012-11-27 19:07:18 +00:00

ref

Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

2012-11-28 23:59:15 +01:00

audiogen.c

…

base64.c

…

copycooker.sh

…

fate-run.sh

tests: prefer ffprobe -show_entries to -show_format_entry

2012-11-22 15:57:41 +01:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

…

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

fate: add more pix_fmt tests for xwd

2012-11-05 22:31:24 +00:00

lavfi-regression.sh

Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

2012-11-28 23:59:15 +01:00

lena.pnm

…

Makefile

fate-rsync: replace -a by -rlt

2012-11-07 18:33:52 +01:00

md5.sh

…

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

…

tiny_psnr.c

…

utils.c

…

videogen.c

…