Mercurial > mplayer.hg

comparison libmpdemux/demux_mkv.c @ 32111:7c8d240d37a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace sizeof(type)
author reimar
date Sun, 12 Sep 2010 13:26:39 +0000
parents cd81fce1f010
children 741bcef4ad3a
comparison
equal deleted inserted replaced
32110:f9a0197ad67c 32111:7c8d240d37a6
1467 1467
1468 if (track->ms_compat) { /* MS compatibility mode */ 1468 if (track->ms_compat) { /* MS compatibility mode */
1469 BITMAPINFOHEADER *src; 1469 BITMAPINFOHEADER *src;
1470 1470
1471 if (track->private_data == NULL 1471 if (track->private_data == NULL
1472 || track->private_size < sizeof(BITMAPINFOHEADER)) 1472 || track->private_size < sizeof(*bih))
1473 return 1; 1473 return 1;
1474 1474
1475 src = (BITMAPINFOHEADER *) track->private_data; 1475 src = (BITMAPINFOHEADER *) track->private_data;
1476 bih = calloc(1, track->private_size); 1476 bih = calloc(1, track->private_size);
1477 bih->biSize = le2me_32(src->biSize); 1477 bih->biSize = le2me_32(src->biSize);
1483 bih->biSizeImage = le2me_32(src->biSizeImage); 1483 bih->biSizeImage = le2me_32(src->biSizeImage);
1484 bih->biXPelsPerMeter = le2me_32(src->biXPelsPerMeter); 1484 bih->biXPelsPerMeter = le2me_32(src->biXPelsPerMeter);
1485 bih->biYPelsPerMeter = le2me_32(src->biYPelsPerMeter); 1485 bih->biYPelsPerMeter = le2me_32(src->biYPelsPerMeter);
1486 bih->biClrUsed = le2me_32(src->biClrUsed); 1486 bih->biClrUsed = le2me_32(src->biClrUsed);
1487 bih->biClrImportant = le2me_32(src->biClrImportant); 1487 bih->biClrImportant = le2me_32(src->biClrImportant);
1488 memcpy((char *) bih + sizeof(BITMAPINFOHEADER), 1488 memcpy(bih + 1,
1489 (char *) src + sizeof(BITMAPINFOHEADER), 1489 src + 1,
1490 track->private_size - sizeof(BITMAPINFOHEADER)); 1490 track->private_size - sizeof(*bih));
1491 1491
1492 if (track->v_width == 0) 1492 if (track->v_width == 0)
1493 track->v_width = bih->biWidth; 1493 track->v_width = bih->biWidth;
1494 if (track->v_height == 0) 1494 if (track->v_height == 0)
1495 track->v_height = bih->biHeight; 1495 track->v_height = bih->biHeight;
1496 } else { 1496 } else {
1497 bih = calloc(1, sizeof(BITMAPINFOHEADER)); 1497 bih = calloc(1, sizeof(*bih));
1498 bih->biSize = sizeof(BITMAPINFOHEADER); 1498 bih->biSize = sizeof(*bih);
1499 bih->biWidth = track->v_width; 1499 bih->biWidth = track->v_width;
1500 bih->biHeight = track->v_height; 1500 bih->biHeight = track->v_height;
1501 bih->biBitCount = 24; 1501 bih->biBitCount = 24;
1502 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount / 8; 1502 bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount / 8;
1503 1503
1511 unsigned int cnt; 1511 unsigned int cnt;
1512 1512
1513 src = (uint8_t *) track->private_data + RVPROPERTIES_SIZE; 1513 src = (uint8_t *) track->private_data + RVPROPERTIES_SIZE;
1514 1514
1515 cnt = track->private_size - RVPROPERTIES_SIZE; 1515 cnt = track->private_size - RVPROPERTIES_SIZE;
1516 bih = realloc(bih, sizeof(BITMAPINFOHEADER) + 8 + cnt); 1516 bih = realloc(bih, sizeof(*bih) + 8 + cnt);
1517 bih->biSize = 48 + cnt; 1517 bih->biSize = 48 + cnt;
1518 bih->biPlanes = 1; 1518 bih->biPlanes = 1;
1519 type2 = AV_RB32(src - 4); 1519 type2 = AV_RB32(src - 4);
1520 if (type2 == 0x10003000 || type2 == 0x10003001) 1520 if (type2 == 0x10003000 || type2 == 0x10003001)
1521 bih->biCompression = mmioFOURCC('R', 'V', '1', '3'); 1521 bih->biCompression = mmioFOURCC('R', 'V', '1', '3');
1615 return 1; 1615 return 1;
1616 mkv_d->audio_tracks[mkv_d->last_aid] = track->tnum; 1616 mkv_d->audio_tracks[mkv_d->last_aid] = track->tnum;
1617 1617
1618 sh_a->default_track = track->default_track; 1618 sh_a->default_track = track->default_track;
1619 sh_a->ds = demuxer->audio; 1619 sh_a->ds = demuxer->audio;
1620 sh_a->wf = malloc(sizeof(WAVEFORMATEX)); 1620 sh_a->wf = malloc(sizeof(*sh_a->wf));
1621 if (track->ms_compat && (track->private_size >= sizeof(WAVEFORMATEX))) { 1621 if (track->ms_compat && (track->private_size >= sizeof(WAVEFORMATEX))) {
1622 WAVEFORMATEX *wf = (WAVEFORMATEX *) track->private_data; 1622 WAVEFORMATEX *wf = (WAVEFORMATEX *) track->private_data;
1623 sh_a->wf = realloc(sh_a->wf, track->private_size); 1623 sh_a->wf = realloc(sh_a->wf, track->private_size);
1624 sh_a->wf->wFormatTag = le2me_16(wf->wFormatTag); 1624 sh_a->wf->wFormatTag = le2me_16(wf->wFormatTag);
1625 sh_a->wf->nChannels = le2me_16(wf->nChannels); 1625 sh_a->wf->nChannels = le2me_16(wf->nChannels);