* commit '9e6b5e61':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
	doc/muxers.texi
	libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>