* commit '811bd078':
  avconv: make input -ss accurate when transcoding

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.h
	ffmpeg_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>