Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 20:01:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create the BITMAPINFOHEADER in an Endian safe way.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-05-25 12:52:18 +00:00
parent 69b2ab0e16
commit 804ac7b02a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2004-05-25 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: The OGM reader was not Endian safe.
2004-05-20 Moritz Bunkus <moritz@bunkus.org> 2004-05-20 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: Rewrite of the VobSub handling code. * mkvmerge: Rewrite of the VobSub handling code.

13
src/input/r_ogm.cpp
View File

@ -449,13 +449,14 @@ ogm_reader_c::create_packetizer(int64_t tid) {
case OGM_STREAM_TYPE_VIDEO: case OGM_STREAM_TYPE_VIDEO:
// AVI compatibility mode. Fill in the values we've got and guess // AVI compatibility mode. Fill in the values we've got and guess
// the others. // the others.
bih.bi_size = sizeof(alBITMAPINFOHEADER); put_uint32(&bih.bi_size, sizeof(alBITMAPINFOHEADER));
bih.bi_width = get_uint32(&sth->sh.video.width); put_uint32(&bih.bi_width, get_uint32(&sth->sh.video.width));
bih.bi_height = get_uint32(&sth->sh.video.height); put_uint32(&bih.bi_height, get_uint32(&sth->sh.video.height));
bih.bi_planes = 1; put_uint16(&bih.bi_planes, 1);
bih.bi_bit_count = 24; put_uint16(&bih.bi_bit_count, 24);
memcpy(&bih.bi_compression, sth->subtype, 4); memcpy(&bih.bi_compression, sth->subtype, 4);
bih.bi_size_image = bih.bi_width * bih.bi_height * 3; put_uint32(&bih.bi_size_image, get_uint32(&bih.bi_width) *
get_uint32(&bih.bi_height) * 3);
ti->private_data = (unsigned char *)&bih; ti->private_data = (unsigned char *)&bih;
ti->private_size = sizeof(alBITMAPINFOHEADER); ti->private_size = sizeof(alBITMAPINFOHEADER);