1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00

Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'

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

See: c11043aca7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-24 22:03:21 +02:00
commit 50daffead2

Diff Content Not Available