# HG changeset patch # User reimar # Date 1230810069 0 # Node ID 321b70afabe1ae11494cfc9e4a4d4796b716a1d7 # Parent dd53119e77c850d569d2a14ad8f3f8be92f71ed8 Code simplification diff -r dd53119e77c8 -r 321b70afabe1 libmpdemux/aviprint.c --- a/libmpdemux/aviprint.c Thu Jan 01 11:39:47 2009 +0000 +++ b/libmpdemux/aviprint.c Thu Jan 01 11:41:09 2009 +0000 @@ -74,7 +74,7 @@ else if (h->cbSize > 0) { int i; - uint8_t* p = ((uint8_t*)h) + sizeof(WAVEFORMATEX); + uint8_t* p = (uint8_t*)(h + 1); mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); for (i = 0; i < h->cbSize; i++) mp_msg(MSGT_HEADER, verbose_level, "[%x] ", p[i]); @@ -96,7 +96,7 @@ if (h->biSize > sizeof(BITMAPINFOHEADER)) { int i; - uint8_t* p = ((uint8_t*)h) + sizeof(BITMAPINFOHEADER); + uint8_t* p = (uint8_t*)(h + 1); mp_msg(MSGT_HEADER, verbose_level, "Unknown extra header dump: "); for (i = 0; i < h->biSize-sizeof(BITMAPINFOHEADER); i++) mp_msg(MSGT_HEADER, verbose_level, "[%x] ", *(p+i)); @@ -135,7 +135,8 @@ int i; unsigned int pos[256]; unsigned int num[256]; - for(i=0;i<256;i++) num[i]=pos[i]=0; + memset(pos, 0, sizeof(pos)); + memset(num, 0, sizeof(num)); for(i=0;i255) id=255;