[FFmpeg-cvslog] Merge commit 'da4f5d9d77882bee568266d764b95b51f81b7871' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 12:59:29 2014 +0100| [bf00132a14b9c0c017404f2a36b9e9213b29e2cd] | committer: Michael Niedermayer

Merge commit 'da4f5d9d77882bee568266d764b95b51f81b7871' into release/2.2

* commit 'da4f5d9d77882bee568266d764b95b51f81b7871':
  mjpegdec: check for pixel format changes

Conflicts:
	libavcodec/mjpegdec.c

See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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