Merge pull request #8283 from ramele1907:master

This commit is contained in:
Vadim Pisarevsky 2017-03-02 05:54:06 +00:00
commit f46fa6e096

View File

@ -720,7 +720,7 @@ public:
strm.putInt(height);
strm.putShort(1); // planes (1 means interleaved data (after decompression))
strm.putShort(channels); // bits per pixel
strm.putShort(8 * channels); // bits per pixel
strm.putInt(fourCC('M', 'J', 'P', 'G'));
strm.putInt(width * height * channels);
strm.putInt(0);