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
..
2012-11-29 13:24:48 +00:00
2012-11-20 00:26:46 -05:00
2012-10-18 13:12:28 +01:00
2012-12-07 11:34:16 +01:00
2012-12-03 01:34:14 +01:00
2013-03-05 11:44:58 +00:00
2012-10-18 13:12:28 +01:00
2012-10-18 13:12:28 +01:00
2013-04-11 23:13:34 +02:00