Mercurial > mplayer.hg

comparison libmpdemux/aviheader.c @ 33841:25667edae85c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: adjust printf format strings to match parameter types This eliminates a bunch of related compiler warnings.
author diego
date Wed, 27 Jul 2011 13:40:06 +0000
parents 277ec491a8a7
children 8f2167abd6e0
comparison
equal deleted inserted replaced
33840:dac9d4f90e89 33841:25667edae85c
267 break; } 267 break; }
268 case ckidSTREAMFORMAT: { // read 'strf' 268 case ckidSTREAMFORMAT: { // read 'strf'
269 if(last_fccType==streamtypeVIDEO){ 269 if(last_fccType==streamtypeVIDEO){
270 sh_video->bih=calloc(FFMAX(chunksize, sizeof(*sh_video->bih)), 1); 270 sh_video->bih=calloc(FFMAX(chunksize, sizeof(*sh_video->bih)), 1);
271 // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); 271 // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
272 mp_msg(MSGT_HEADER, MSGL_V, "Found 'bih', %u bytes of %d\n", 272 mp_msg(MSGT_HEADER, MSGL_V, "Found 'bih', %u bytes of %zu\n",
273 chunksize, sizeof(*sh_video->bih)); 273 chunksize, sizeof(*sh_video->bih));
274 stream_read(demuxer->stream,(char*) sh_video->bih,chunksize); 274 stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
275 le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian 275 le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian
276 if (sh_video->bih->biSize > chunksize && sh_video->bih->biSize > sizeof(*sh_video->bih)) 276 if (sh_video->bih->biSize > chunksize && sh_video->bih->biSize > sizeof(*sh_video->bih))
277 sh_video->bih->biSize = chunksize; 277 sh_video->bih->biSize = chunksize;
324 } else 324 } else
325 if(last_fccType==streamtypeAUDIO){ 325 if(last_fccType==streamtypeAUDIO){
326 unsigned wf_size = chunksize<sizeof(*sh_audio->wf)?sizeof(*sh_audio->wf):chunksize; 326 unsigned wf_size = chunksize<sizeof(*sh_audio->wf)?sizeof(*sh_audio->wf):chunksize;
327 sh_audio->wf=calloc(wf_size,1); 327 sh_audio->wf=calloc(wf_size,1);
328 // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize); 328 // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize);
329 mp_msg(MSGT_HEADER, MSGL_V, "Found 'wf', %d bytes of %d\n", 329 mp_msg(MSGT_HEADER, MSGL_V, "Found 'wf', %u bytes of %zu\n",
330 chunksize, sizeof(*sh_audio->wf)); 330 chunksize, sizeof(*sh_audio->wf));
331 stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize); 331 stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
332 le2me_WAVEFORMATEX(sh_audio->wf); 332 le2me_WAVEFORMATEX(sh_audio->wf);
333 if (sh_audio->wf->cbSize != 0 && 333 if (sh_audio->wf->cbSize != 0 &&
334 wf_size < sizeof(*sh_audio->wf)+sh_audio->wf->cbSize) { 334 wf_size < sizeof(*sh_audio->wf)+sh_audio->wf->cbSize) {