* commit 'a1e05b04':
  lavfi: add trim and atrim filters.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>