Mercurial > mplayer.hg

changeset 36661:1b0d31ceb2ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some format string mismatches.
author reimar
date Sun, 26 Jan 2014 18:59:16 +0000
parents 7fd255e0db1b
children 50e0e5795289
files libmpcodecs/ad_libdv.c libmpcodecs/ae_lame.c libmpdemux/demux_rawdv.c
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_libdv.c	Sun Jan 26 18:59:15 2014 +0000
+++ b/libmpcodecs/ad_libdv.c	Sun Jan 26 18:59:16 2014 +0000
@@ -103,7 +103,7 @@
 
    if(xx!=decoder->frame_size)
        mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_MPCODECS_AudioFramesizeDiffers,
-           xx, decoder->frame_size);
+           xx, (int)decoder->frame_size);
 
    if (dv_decode_full_audio(decoder, dv_audio_frame,(int16_t**) audioBuffers))
    {
--- a/libmpcodecs/ae_lame.c	Sun Jan 26 18:59:15 2014 +0000
+++ b/libmpcodecs/ae_lame.c	Sun Jan 26 18:59:16 2014 +0000
@@ -94,7 +94,7 @@
     mux_a->h.dwSampleSize=0; // VBR
     mux_a->h.dwRate=encoder->params.sample_rate;
     mux_a->h.dwScale=encoder->params.samples_per_frame; // samples/frame
-    if(sizeof(MPEGLAYER3WAVEFORMAT)!=30) mp_msg(MSGT_MENCODER,MSGL_WARN,MSGTR_MP3WaveFormatSizeNot30,sizeof(MPEGLAYER3WAVEFORMAT));
+    if(sizeof(MPEGLAYER3WAVEFORMAT)!=30) mp_msg(MSGT_MENCODER,MSGL_WARN,MSGTR_MP3WaveFormatSizeNot30,(int)sizeof(MPEGLAYER3WAVEFORMAT));
     mux_a->wf=malloc(sizeof(MPEGLAYER3WAVEFORMAT)); // should be 30
     mux_a->wf->wFormatTag=0x55; // MP3
     mux_a->wf->nChannels= (lame_param_mode<0) ? encoder->params.channels : ((lame_param_mode==3) ? 1 : 2);
--- a/libmpdemux/demux_rawdv.c	Sun Jan 26 18:59:15 2014 +0000
+++ b/libmpdemux/demux_rawdv.c	Sun Jan 26 18:59:16 2014 +0000
@@ -183,7 +183,7 @@
 
    sh_video->disp_w = dv_decoder->width;
    sh_video->disp_h = dv_decoder->height;
-   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() frame_size: %d w: %d h: %d dif_seq: %d system: %d\n",dv_decoder->frame_size,dv_decoder->width, dv_decoder->height,dv_decoder->num_dif_seqs,dv_decoder->system);
+   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() frame_size: %d w: %d h: %d dif_seq: %d system: %d\n",(int)dv_decoder->frame_size,dv_decoder->width, dv_decoder->height,dv_decoder->num_dif_seqs,dv_decoder->system);
 
    sh_video->fps= (dv_decoder->system==e_dv_system_525_60?29.97:25);
    sh_video->frametime = 1.0/sh_video->fps;
@@ -204,7 +204,7 @@
    frames->frame_size=dv_decoder->frame_size;
    frames->frame_number=demuxer->stream->end_pos/frames->frame_size;
 
-   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() seek to %llu, size: %d, dv_dec->frame_size: %d\n",frames->current_filepos,frames->frame_size, dv_decoder->frame_size);
+   mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() seek to %llu, size: %d, dv_dec->frame_size: %d\n",(long long unsigned)frames->current_filepos,frames->frame_size, (int)dv_decoder->frame_size);
     if (dv_decoder->audio != NULL && demuxer->audio->id>=-1){
        sh_audio_t *sh_audio =  new_sh_audio(demuxer, 0, NULL);
        demuxer->audio->id = 0;