Michael Niedermayer ebbd4fd5f0 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  FATE: add a test for the interlace filter
  lavfi: new interlace filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-04-12 16:32:33 +02:00

..

fate

Merge remote-tracking branch 'qatar/master'

2013-04-12 16:32:33 +02:00

filtergraphs

Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'

2013-04-11 02:10:12 +02:00

ref

Merge remote-tracking branch 'qatar/master'

2013-04-12 16:32:33 +02:00

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01: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

fate: Print correct error message for reference generation too

2013-03-30 11:41:58 +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

Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

2013-03-12 21:34:24 +01:00

lavfi-regression.sh

lavfi/aspect: switch to an AVOptions-based system.

2013-04-11 22:05:03 +02:00

lena.pnm

…

Makefile

lavfi/aevalsrc: switch to an AVOptions-based system.

2013-04-11 17:28:02 +02: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

tiny_ssim.c

tests/tiny_ssim: include the 2 macros instead of a header

2013-03-27 01:38:18 +01: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