* commit '9b56ac74':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>