[FFmpeg-cvslog] Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 24 22:03:21 2014 +0200| [50daffead2deba9642f0f7069072871adfb75bea] | committer: Michael Niedermayer

Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'

* commit '2deb614272e6faad8802c5341971d08c7272f74d':
  mjpegdec: Properly set the context colorspace info

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

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