* commit '161a301d':
  mpjpeg: Write the Content-length

Conflicts:
	libavformat/mpjpeg.c

See: 0d2f4eedMerged-by: Michael Niedermayer <michaelni@gmx.at>