* commit '8cd472d3':
  avconv: make output -ss insert trim/atrim filters.

Conflicts:
	Changelog
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>