Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Jun 2014 20:03:21 +0000 (22:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Jun 2014 20:03:46 +0000 (22:03 +0200)
* commit '2deb614272e6faad8802c5341971d08c7272f74d':
  mjpegdec: Properly set the context colorspace info

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

Trivial merge