[FFmpeg-cvslog] Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  1 11:26:53 2013 +0200| [3319679d0a36bec3e78f639d6f9fbbe596f6eec3] | committer: Michael Niedermayer

Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'

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

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3319679d0a36bec3e78f639d6f9fbbe596f6eec3
---