* commit '56ee3f9d':
  avconv: distinguish between -ss 0 and -ss not being used

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