* commit 'd09b4cce':
  mpjpeg: Simplify using avio_printf

Conflicts:
	libavformat/mpjpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>