diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-04-28 09:36:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:46:48 +0300 |
| commit | 6506d4ad84eac67e69437def2c8ee69fcfc14ed5 (patch) | |
| tree | 255e7f58b809a9bc7377047533cfb19399ce4ffd /libmpdemux | |
| parent | 7e65428712beacd416dc3410c52f22ebfd3b4c53 (diff) | |
| download | mpv-6506d4ad84eac67e69437def2c8ee69fcfc14ed5.tar.bz2 mpv-6506d4ad84eac67e69437def2c8ee69fcfc14ed5.tar.xz | |
cleanup: remove more warnings
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/aviheader.c | 4 | ||||
| -rw-r--r-- | libmpdemux/mf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/video.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 27d2fd5fdb..cd2db91726 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -267,7 +267,7 @@ while(1){ if(last_fccType==streamtypeVIDEO){ sh_video->bih=calloc(FFMAX(chunksize, sizeof(*sh_video->bih)), 1); // sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize); - mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'bih', %u bytes of %d\n",chunksize,sizeof(*sh_video->bih)); + mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'bih', %u bytes of %zu\n",chunksize,sizeof(*sh_video->bih)); stream_read(demuxer->stream,(char*) sh_video->bih,chunksize); le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian if (sh_video->bih->biSize > chunksize && sh_video->bih->biSize > sizeof(*sh_video->bih)) @@ -323,7 +323,7 @@ while(1){ unsigned wf_size = chunksize<sizeof(*sh_audio->wf)?sizeof(*sh_audio->wf):chunksize; sh_audio->wf=calloc(wf_size,1); // sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize); - mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'wf', %d bytes of %d\n",chunksize,sizeof(*sh_audio->wf)); + mp_tmsg(MSGT_HEADER,MSGL_V,"Found 'wf', %d bytes of %zu\n",chunksize,sizeof(*sh_audio->wf)); stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize); le2me_WAVEFORMATEX(sh_audio->wf); if (sh_audio->wf->cbSize != 0 && diff --git a/libmpdemux/mf.c b/libmpdemux/mf.c index 3127176f6e..6b22c6147d 100644 --- a/libmpdemux/mf.c +++ b/libmpdemux/mf.c @@ -126,7 +126,7 @@ mf_t* open_mf(char * filename){ mf->nr_of_files=gg.gl_pathc; mf->names=calloc( gg.gl_pathc, sizeof( char* ) ); - mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d (%d)\n",mf->nr_of_files, gg.gl_pathc * sizeof( char* ) ); + mp_msg( MSGT_STREAM,MSGL_INFO,"[mf] number of files: %d (%zd)\n",mf->nr_of_files, gg.gl_pathc * sizeof( char* ) ); for( i=0;i < gg.gl_pathc;i++ ) { diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 3244624e77..2e41cf0b4b 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -387,7 +387,7 @@ mpeg_header_parser: if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) { sh_video->bih = calloc(1, sizeof(*sh_video->bih) + videobuf_len); if(sh_video->bih == NULL) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %d bytes for VC-1 extradata!\n", sizeof(*sh_video->bih) + videobuf_len); + mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %zu bytes for VC-1 extradata!\n", sizeof(*sh_video->bih) + videobuf_len); return 0; } sh_video->bih->biSize= sizeof(*sh_video->bih) + videobuf_len; |