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

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

base64.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

copycooker.sh

build: remove unused copy regression test script

2011-07-07 22:47:24 +02:00

fate-run.sh

tests: prefer ffprobe -show_entries to -show_format_entry

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

fate-update.sh

fate: remove stale fate-update.sh script

2011-03-19 13:35:52 +00:00

fate-valgrind.supp

Add a --valgrind configure option.

2012-01-21 12:04:46 +01:00

fate.sh

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

ffserver-regression.sh

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.conf

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.regression.ref

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

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

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

regression-funcs.sh

fate: remove unused functions

2012-05-30 05:57:56 +02:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00

test.ffmeta

fate/ffprobe: add some stream metadata.

2012-10-08 11:03:27 +02:00

tiny_psnr.c

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

utils.c

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00