# HG changeset patch # User reimar # Date 1351807994 0 # Node ID 42613bcd1bfe7763736f09bda2970898d690cacb # Parent 2080c7f8e74f3fdcfcc688ef98bdb68506e9b9a7 Do not needlessly use "long" types. diff -r 2080c7f8e74f -r 42613bcd1bfe sub/vobsub.c --- a/sub/vobsub.c Thu Nov 01 22:00:48 2012 +0000 +++ b/sub/vobsub.c Thu Nov 01 22:13:14 2012 +0000 @@ -837,7 +837,7 @@ } else if (memcmp(block, ifo_magic, strlen(ifo_magic) + 1)) mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Bad magic in IFO header\n"); else { - unsigned long pgci_sector = block[0xcc] << 24 | block[0xcd] << 16 + unsigned pgci_sector = block[0xcc] << 24 | block[0xcd] << 16 | block[0xce] << 8 | block[0xcf]; int standard = (block[0x200] & 0x30) >> 4; int resolution = (block[0x201] & 0x0c) >> 2; @@ -870,8 +870,8 @@ || rar_read(block, sizeof(block), 1, fd) != 1) mp_msg(MSGT_VOBSUB, MSGL_ERR, "VobSub: Can't read IFO PGCI\n"); else { - unsigned long idx; - unsigned long pgc_offset = block[0xc] << 24 | block[0xd] << 16 + unsigned idx; + unsigned pgc_offset = block[0xc] << 24 | block[0xd] << 16 | block[0xe] << 8 | block[0xf]; for (idx = 0; idx < 16; ++idx) { unsigned char *p = block + pgc_offset + 0xa4 + 4 * idx;