diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libmpdemux/aviprint.c | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libmpdemux/aviprint.c')
| -rw-r--r-- | libmpdemux/aviprint.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index f0c3a89d8a..35af2ffbdf 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -74,7 +74,7 @@ void print_wave_header(WAVEFORMATEX *h, int verbose_level){ 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 @@ void print_video_header(BITMAPINFOHEADER *h, int verbose_level){ 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 @@ void print_index(AVIINDEXENTRY *idx, int idx_size, int verbose_level){ 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;i<idx_size;i++){ int id=avi_stream_id(idx[i].ckid); if(id<0 || id>255) id=255; |