[FFmpeg-cvslog] Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 00:44:28 2015 +0200| [8985e7c56130b42f6184b064b7141e365f59356b] | committer: Michael Niedermayer

Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'

* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8985e7c56130b42f6184b064b7141e365f59356b
---