From 97897eeeb22b1238e56632b16cda1a0375ae7708 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 1 May 2008 21:57:00 +0300 Subject: [PATCH] NIH syndrome cure (2) --- modules/access/dshow/dshow.cpp | 2 +- modules/access/dvdnav.c | 10 ++++---- modules/access/ftp.c | 6 ++--- modules/access/http.c | 6 ++--- modules/access/mms/mmsh.c | 6 ++--- modules/access/mms/mmstu.c | 2 +- modules/access/smb.c | 2 +- modules/access_filter/record.c | 2 +- modules/access_output/udp.c | 10 ++++---- modules/audio_filter/equalizer.c | 2 +- modules/audio_output/pulse.c | 2 +- modules/audio_output/waveout.c | 2 +- modules/codec/dmo/dmo.c | 6 ++--- modules/codec/dvbsub.c | 2 +- modules/codec/ffmpeg/demux.c | 14 +++++------ modules/codec/ffmpeg/encoder.c | 4 ++-- modules/codec/ffmpeg/mux.c | 6 ++--- modules/codec/spudec/spudec.c | 2 +- modules/control/http/http.c | 4 ++-- modules/control/http/mvar.c | 2 +- modules/control/netsync.c | 8 +++---- modules/demux/asf/libasf.c | 22 ++++++++--------- modules/demux/avi/avi.c | 10 ++++---- modules/demux/avi/libavi.c | 6 ++--- modules/demux/demuxdump.c | 2 +- modules/demux/mkv.cpp | 28 +++++++++++----------- modules/demux/mod.c | 2 +- modules/demux/mp4/libmp4.c | 10 ++++---- modules/demux/mp4/mp4.c | 8 +++---- modules/demux/ogg.c | 4 ++-- modules/demux/ps.c | 4 ++-- modules/demux/ts.c | 2 +- modules/demux/ty.c | 4 ++-- modules/misc/logger.c | 2 +- modules/misc/rtsp.c | 2 +- modules/mux/avi.c | 2 +- modules/mux/mpeg/ts.c | 18 +++++++------- modules/packetizer/h264.c | 2 +- modules/packetizer/mpegvideo.c | 2 +- modules/packetizer/vc1.c | 4 ++-- modules/services_discovery/sap.c | 2 +- modules/stream_out/bridge.c | 2 +- modules/stream_out/rtsp.c | 2 +- modules/stream_out/transcode.c | 2 +- modules/stream_out/transrate/transrate.c | 4 ++-- modules/video_filter/mosaic.c | 2 +- modules/visualization/galaktos/init_cond.c | 2 +- modules/visualization/galaktos/preset.c | 2 +- 48 files changed, 126 insertions(+), 126 deletions(-) diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index e15745d95a..1f04e940cb 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -1728,7 +1728,7 @@ static int Demux( demux_t *p_demux ) i_pts /= 10; /* Dshow works with 100 nano-seconds resolution */ #if 0 - msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: "I64Fd, + msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: %"PRId64, i_stream, i_data_size, i_pts ); #endif diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 0fbce334e9..14fadb85ce 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -731,11 +731,11 @@ static int Demux( demux_t *p_demux ) msg_Dbg( p_demux, "DVDNAV_CELL_CHANGE" ); msg_Dbg( p_demux, " - cellN=%d", event->cellN ); msg_Dbg( p_demux, " - pgN=%d", event->pgN ); - msg_Dbg( p_demux, " - cell_length="I64Fd, event->cell_length ); - msg_Dbg( p_demux, " - pg_length="I64Fd, event->pg_length ); - msg_Dbg( p_demux, " - pgc_length="I64Fd, event->pgc_length ); - msg_Dbg( p_demux, " - cell_start="I64Fd, event->cell_start ); - msg_Dbg( p_demux, " - pg_start="I64Fd, event->pg_start ); + msg_Dbg( p_demux, " - cell_length=%"PRId64, event->cell_length ); + msg_Dbg( p_demux, " - pg_length=%"PRId64, event->pg_length ); + msg_Dbg( p_demux, " - pgc_length=%"PRId64, event->pgc_length ); + msg_Dbg( p_demux, " - cell_start=%"PRId64, event->cell_start ); + msg_Dbg( p_demux, " - pg_start=%"PRId64, event->pg_start ); /* Store the lenght in time of the current PGC */ p_sys->i_pgc_length = event->pgc_length / 90 * 1000; diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 3aca2f6050..c171b71d35 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -334,7 +334,7 @@ static int InOpen( vlc_object_t *p_this ) } p_access->info.i_size = atoll( &psz_arg[4] ); free( psz_arg ); - msg_Dbg( p_access, "file size: "I64Fd, p_access->info.i_size ); + msg_Dbg( p_access, "file size: %"PRId64, p_access->info.i_size ); /* Start the 'stream' */ if( ftp_StartStream( p_this, p_sys, 0 ) < 0 ) @@ -436,7 +436,7 @@ static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, int64_t i_pos ) if( i_pos < 0 ) return VLC_EGENERIC; - msg_Dbg( p_access, "seeking to "I64Fd, i_pos ); + msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); ftp_StopStream( (vlc_object_t *)p_access, p_sys ); if( ftp_StartStream( (vlc_object_t *)p_access, p_sys, i_pos ) < 0 ) @@ -734,7 +734,7 @@ static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys, if( i_start > 0 ) { - if( ftp_SendCommand( p_access, p_sys, "REST "I64Fu, i_start ) < 0 || + if( ftp_SendCommand( p_access, p_sys, "REST %"PRIu64, i_start ) < 0 || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 3 ) { msg_Err( p_access, "cannot set restart offset" ); diff --git a/modules/access/http.c b/modules/access/http.c index c129edb46e..9d501a7820 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -808,7 +808,7 @@ static ssize_t ReadCompressed( access_t *p_access, uint8_t *p_buffer, *****************************************************************************/ static int Seek( access_t *p_access, int64_t i_pos ) { - msg_Dbg( p_access, "trying to seek to "I64Fd, i_pos ); + msg_Dbg( p_access, "trying to seek to %"PRId64, i_pos ); Disconnect( p_access ); @@ -1072,7 +1072,7 @@ static int Request( access_t *p_access, int64_t i_tell ) if( p_sys->i_version == 1 ) { net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, - "Range: bytes="I64Fd"-\r\n", i_tell ); + "Range: bytes=%"PRId64"-\r\n", i_tell ); } /* Cookies */ @@ -1222,7 +1222,7 @@ static int Request( access_t *p_access, int64_t i_tell ) else { p_access->info.i_size = i_tell + atoll( p ); - msg_Dbg( p_access, "stream size="I64Fd, p_access->info.i_size ); + msg_Dbg( p_access, "stream size=%"PRId64, p_access->info.i_size ); } } else if( !strcasecmp( psz, "Location" ) ) diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c index 3e40e5eb01..e6eb32a745 100644 --- a/modules/access/mms/mmsh.c +++ b/modules/access/mms/mmsh.c @@ -310,7 +310,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) off_t i_offset; off_t i_packet; - msg_Dbg( p_access, "seeking to "I64Fd, i_pos ); + msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); i_packet = ( i_pos - p_sys->i_header ) / p_sys->asfh.i_min_data_packet_size; i_offset = ( i_pos - p_sys->i_header ) % p_sys->asfh.i_min_data_packet_size; @@ -474,7 +474,7 @@ static int Reset( access_t *p_access ) E_( asf_HeaderParse )( &p_sys->asfh, p_sys->p_header, p_sys->i_header ); - msg_Dbg( p_access, "packet count="I64Fd" packet size=%d", + msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d", p_sys->asfh.i_data_packets_count, p_sys->asfh.i_min_data_packet_size ); @@ -705,7 +705,7 @@ static int Describe( access_t *p_access, char **ppsz_location ) * and bitrate mutual exclusion(optional) */ E_( asf_HeaderParse )( &p_sys->asfh, p_sys->p_header, p_sys->i_header ); - msg_Dbg( p_access, "packet count="I64Fd" packet size=%d", + msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d", p_sys->asfh.i_data_packets_count, p_sys->asfh.i_min_data_packet_size ); diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c index 6f894334a7..b3d7af702a 100644 --- a/modules/access/mms/mmstu.c +++ b/modules/access/mms/mmstu.c @@ -324,7 +324,7 @@ static int Seek( access_t * p_access, int64_t i_pos ) i_packet = ( i_pos - p_sys->i_header ) / p_sys->i_packet_length; i_offset = ( i_pos - p_sys->i_header ) % p_sys->i_packet_length; } - msg_Dbg( p_access, "seeking to "I64Fd " (packet:%d)", i_pos, i_packet ); + msg_Dbg( p_access, "seeking to %"PRId64 " (packet:%d)", i_pos, i_packet ); MMSStop( p_access ); msg_Dbg( p_access, "stream stopped (seek)" ); diff --git a/modules/access/smb.c b/modules/access/smb.c index 0d6471f915..39d5b87367 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -330,7 +330,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) if( i_pos < 0 ) return VLC_EGENERIC; - msg_Dbg( p_access, "seeking to "I64Fd, i_pos ); + msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); #ifdef USE_CTX i_ret = p_sys->p_smb->lseek(p_sys->p_smb, p_sys->p_file, i_pos, SEEK_SET); diff --git a/modules/access_filter/record.c b/modules/access_filter/record.c index 90457dced8..37474ee3ea 100644 --- a/modules/access_filter/record.c +++ b/modules/access_filter/record.c @@ -335,7 +335,7 @@ static void Dump( access_t *p_access, uint8_t *p_buffer, int i_buffer ) { if( p_sys->f ) { - msg_Dbg( p_access, "dumped "I64Fd" kb (%s)", + msg_Dbg( p_access, "dumped %"PRId64" kb (%s)", p_sys->i_size/1024, p_sys->psz_file ); Notify( p_access, false ); diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c index 8e94d0f2cb..0ef2828532 100644 --- a/modules/access_output/udp.c +++ b/modules/access_output/udp.c @@ -350,7 +350,7 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) { if( p_sys->p_buffer->i_dts + p_sys->p_thread->i_caching < now ) { - msg_Dbg( p_access, "late packet for UDP input (" I64Fd ")", + msg_Dbg( p_access, "late packet for UDP input (%"PRId64 ")", now - p_sys->p_buffer->i_dts - p_sys->p_thread->i_caching ); } @@ -391,7 +391,7 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) /* Flush */ if( p_sys->p_buffer->i_dts + p_sys->p_thread->i_caching < now ) { - msg_Dbg( p_access, "late packet for udp input (" I64Fd ")", + msg_Dbg( p_access, "late packet for udp input (%"PRId64 ")", mdate() - p_sys->p_buffer->i_dts - p_sys->p_thread->i_caching ); } @@ -484,7 +484,7 @@ static void ThreadWrite( vlc_object_t *p_this ) if( i_date - i_date_last > 2000000 ) { if( !i_dropped_packets ) - msg_Dbg( p_thread, "mmh, hole ("I64Fd" > 2s) -> drop", + msg_Dbg( p_thread, "mmh, hole (%"PRId64" > 2s) -> drop", i_date - i_date_last ); block_FifoPut( p_thread->p_empty_blocks, p_pk ); @@ -496,7 +496,7 @@ static void ThreadWrite( vlc_object_t *p_this ) else if( i_date - i_date_last < -1000 ) { if( !i_dropped_packets ) - msg_Dbg( p_thread, "mmh, packets in the past ("I64Fd")", + msg_Dbg( p_thread, "mmh, packets in the past (%"PRId64")", i_date_last - i_date ); } } @@ -524,7 +524,7 @@ static void ThreadWrite( vlc_object_t *p_this ) i_sent = mdate(); if ( i_sent > i_date + 20000 ) { - msg_Dbg( p_thread, "packet has been sent too late (" I64Fd ")", + msg_Dbg( p_thread, "packet has been sent too late (%"PRId64 ")", i_sent - i_date ); } #endif diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index d5793ab5b1..dd8aa67966 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -495,7 +495,7 @@ static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd, eqz_preset_10b[i]->f_amp[j] ); div = lldiv( eqz_preset_10b[i]->f_amp[j] * 10000000, 10000000 ); - sprintf( psz_newbands, "%s "I64Fd".%07u", psz_newbands, + sprintf( psz_newbands, "%s %"PRId64".%07u", psz_newbands, (int64_t)div.quot, (unsigned int) div.rem ); } if( p_sys->b_first == false ) diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c index 8d08ec7076..1222211cf0 100644 --- a/modules/audio_output/pulse.c +++ b/modules/audio_output/pulse.c @@ -405,7 +405,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) { latency = 0; } - PULSE_DEBUG( "Pulse stream request latency="I64Fd"", latency); + PULSE_DEBUG( "Pulse stream request latency=%"PRId64"", latency); next_date = mdate() + latency; diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index b329d14781..95b583c093 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -994,7 +994,7 @@ static void WaveOutThread( notification_thread_t *p_notif ) if( p_aout->b_die ) return; - msg_Dbg( p_aout, "will start to play in "I64Fd" us", + msg_Dbg( p_aout, "will start to play in %"PRId64" us", (p_sys->start_date - AOUT_PTS_TOLERANCE/4)-mdate()); // than wait a short time... before grabbing first frames diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index d465e673cd..acbe5e39c0 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -1472,7 +1472,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) { /* No output generated */ #ifdef DMO_DEBUG - msg_Dbg( p_enc, "ProcessInput(): no output generated "I64Fd, i_pts ); + msg_Dbg( p_enc, "ProcessInput(): no output generated %"PRId64, i_pts ); #endif return NULL; } @@ -1534,7 +1534,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) if( db.dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIME ) { #ifdef DMO_DEBUG - msg_Dbg( p_enc, "ProcessOutput(): pts: "I64Fd", "I64Fd, + msg_Dbg( p_enc, "ProcessOutput(): pts: %"PRId64", %"PRId64, i_pts, db.rtTimestamp / 10 ); #endif i_pts = db.rtTimestamp / 10; @@ -1544,7 +1544,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) { p_block_out->i_length = db.rtTimelength / 10; #ifdef DMO_DEBUG - msg_Dbg( p_enc, "ProcessOutput(): length: "I64Fd, + msg_Dbg( p_enc, "ProcessOutput(): length: %"PRId64, p_block_out->i_length ); #endif } diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c index 44315ef72e..841a94b1bb 100644 --- a/modules/codec/dvbsub.c +++ b/modules/codec/dvbsub.c @@ -406,7 +406,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) } #ifdef DEBUG_DVBSUB - msg_Dbg( p_dec, "subtitle packet received: "I64Fd, p_sys->i_pts ); + msg_Dbg( p_dec, "subtitle packet received: %"PRId64, p_sys->i_pts ); #endif p_sys->b_page = false; diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c index ec5823f0a0..29957c83c0 100644 --- a/modules/codec/ffmpeg/demux.c +++ b/modules/codec/ffmpeg/demux.c @@ -254,10 +254,10 @@ int E_(OpenDemux)( vlc_object_t *p_this ) msg_Dbg( p_demux, "AVFormat supported stream" ); msg_Dbg( p_demux, " - format = %s (%s)", p_sys->fmt->name, p_sys->fmt->long_name ); - msg_Dbg( p_demux, " - start time = "I64Fd, + msg_Dbg( p_demux, " - start time = %"PRId64, ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ? p_sys->ic->start_time * 1000000 / AV_TIME_BASE : -1 ); - msg_Dbg( p_demux, " - duration = "I64Fd, + msg_Dbg( p_demux, " - duration = %"PRId64, ( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE ) ? p_sys->ic->duration * 1000000 / AV_TIME_BASE : -1 ); @@ -327,7 +327,7 @@ static int Demux( demux_t *p_demux ) p_sys->ic->streams[pkt.stream_index]->time_base.den; #ifdef AVFORMAT_DEBUG - msg_Dbg( p_demux, "tk[%d] dts="I64Fd" pts="I64Fd, + msg_Dbg( p_demux, "tk[%d] dts=%"PRId64" pts=%"PRId64, pkt.stream_index, p_frame->i_dts, p_frame->i_pts ); #endif @@ -380,7 +380,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) i64 += p_sys->ic->start_time; - msg_Warn( p_demux, "DEMUX_SET_POSITION: "I64Fd, i64 ); + msg_Warn( p_demux, "DEMUX_SET_POSITION: %"PRId64, i64 ); /* If we have a duration, we prefer to seek by time but if we don't, or if the seek fails, try BYTE seeking */ @@ -390,7 +390,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) int64_t i_size = stream_Size( p_demux->s ); i64 = (int64_t)i_size * f; - msg_Warn( p_demux, "DEMUX_SET_BYTE_POSITION: "I64Fd, i64 ); + msg_Warn( p_demux, "DEMUX_SET_BYTE_POSITION: %"PRId64, i64 ); if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BYTE ) < 0 ) return VLC_EGENERIC; } @@ -418,7 +418,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) i64 += p_sys->ic->start_time; - msg_Warn( p_demux, "DEMUX_SET_TIME: "I64Fd, i64 ); + msg_Warn( p_demux, "DEMUX_SET_TIME: %"PRId64, i64 ); if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 ) { @@ -476,7 +476,7 @@ static offset_t IOSeek( void *opaque, offset_t offset, int whence ) int64_t i_size = stream_Size( p_demux->s ); #ifdef AVFORMAT_DEBUG - msg_Warn( p_demux, "IOSeek offset: "I64Fd", whence: %i", offset, whence ); + msg_Warn( p_demux, "IOSeek offset: %"PRId64", whence: %i", offset, whence ); #endif switch( whence ) diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c index 4494676418..4963e5752d 100644 --- a/modules/codec/ffmpeg/encoder.c +++ b/modules/codec/ffmpeg/encoder.c @@ -872,13 +872,13 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) if ( p_sys->i_last_pts == frame.pts ) { msg_Warn( p_enc, "almost fed libavcodec with two frames with the " - "same PTS (" I64Fd ")", frame.pts ); + "same PTS (%"PRId64 ")", frame.pts ); return NULL; } else if ( p_sys->i_last_pts > frame.pts ) { msg_Warn( p_enc, "almost fed libavcodec with a frame in the " - "past (current: " I64Fd ", last: "I64Fd")", + "past (current: %"PRId64 ", last: %"PRId64")", frame.pts, p_sys->i_last_pts ); return NULL; } diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c index 309b2e5420..def43e58f1 100644 --- a/modules/codec/ffmpeg/mux.c +++ b/modules/codec/ffmpeg/mux.c @@ -374,8 +374,8 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input ) if( av_write_frame( p_sys->oc, &pkt ) < 0 ) { - msg_Err( p_mux, "could not write frame (pts: "I64Fd", dts: "I64Fd") " - "(pkt pts: "I64Fd", dts: "I64Fd")", + msg_Err( p_mux, "could not write frame (pts: %"PRId64", dts: %"PRId64") " + "(pkt pts: %"PRId64", dts: %"PRId64")", p_data->i_pts, p_data->i_dts, pkt.pts, pkt.dts ); block_Release( p_data ); return VLC_EGENERIC; @@ -485,7 +485,7 @@ static offset_t IOSeek( void *opaque, offset_t offset, int whence ) int64_t i_absolute; #ifdef AVFORMAT_DEBUG - msg_Dbg( p_mux, "IOSeek offset: "I64Fd", whence: %i", offset, whence ); + msg_Dbg( p_mux, "IOSeek offset: %"PRId64", whence: %i", offset, whence ); #endif switch( whence ) diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c index 95842f985d..f01d4c5ea9 100644 --- a/modules/codec/spudec/spudec.c +++ b/modules/codec/spudec/spudec.c @@ -205,7 +205,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block ) ( p_block->i_pts <= 0 || p_block->i_buffer < 4 ) ) { msg_Dbg( p_dec, "invalid starting packet (size < 4 or pts <=0)" ); - msg_Dbg( p_dec, "spu size: %d, i_pts: "I64Fd" i_buffer: %d", + msg_Dbg( p_dec, "spu size: %d, i_pts: %"PRId64" i_buffer: %d", p_sys->i_spu_size, p_block->i_pts, p_block->i_buffer ); block_Release( p_block ); return NULL; diff --git a/modules/control/http/http.c b/modules/control/http/http.c index 88cdfa9907..42a70ba6f4 100644 --- a/modules/control/http/http.c +++ b/modules/control/http/http.c @@ -442,9 +442,9 @@ static void ParseExecute( httpd_file_sys_t *p_args, char *p_buffer, var_Get( p_sys->p_input, "position", &val); sprintf( position, "%d" , (int)((val.f_float) * 100.0)); var_Get( p_sys->p_input, "time", &val); - sprintf( time, I64Fi, (int64_t)val.i_time / I64C(1000000) ); + sprintf( time, "%"PRIi64, (int64_t)val.i_time / I64C(1000000) ); var_Get( p_sys->p_input, "length", &val); - sprintf( length, I64Fi, (int64_t)val.i_time / I64C(1000000) ); + sprintf( length, "%"PRIi64, (int64_t)val.i_time / I64C(1000000) ); var_Get( p_sys->p_input, "state", &val ); if( val.i_int == PLAYING_S ) diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c index fb00be1984..4fe22ea667 100644 --- a/modules/control/http/mvar.c +++ b/modules/control/http/mvar.c @@ -602,7 +602,7 @@ mvar_t *E_(mvar_FileSetNew)( intf_thread_t *p_intf, char *name, E_(mvar_AppendNewVar)( f, "type", "unknown" ); } - sprintf( psz_ctime, I64Fd, (int64_t)stat_info.st_size ); + sprintf( psz_ctime, "%"PRId64, (int64_t)stat_info.st_size ); E_(mvar_AppendNewVar)( f, "size", psz_ctime ); /* FIXME memory leak FIXME */ diff --git a/modules/control/netsync.c b/modules/control/netsync.c index c62dfa411e..53676bfed0 100644 --- a/modules/control/netsync.c +++ b/modules/control/netsync.c @@ -234,8 +234,8 @@ static void Run( intf_thread_t *p_intf ) (struct sockaddr *)&from, i_struct_size ); #if 0 - msg_Dbg( p_intf, "Master clockref: "I64Fd" -> "I64Fd", from %s " - "(date: "I64Fd")", i_clockref, i_master_clockref, + msg_Dbg( p_intf, "Master clockref: %"PRId64" -> %"PRId64", from %s " + "(date: %"PRId64")", i_clockref, i_master_clockref, from.ss_family == AF_INET ? inet_ntoa(((struct sockaddr_in *)&from)->sin_addr) : "non-IPv4", i_date ); @@ -298,8 +298,8 @@ static void Run( intf_thread_t *p_intf ) } #if 0 - msg_Dbg( p_intf, "Slave clockref: "I64Fd" -> "I64Fd" -> "I64Fd", " - "clock diff: "I64Fd" drift: "I64Fd, + msg_Dbg( p_intf, "Slave clockref: %"PRId64" -> %"PRId64" -> %"PRId64", " + "clock diff: %"PRId64" drift: %"PRId64, i_clockref, i_master_clockref, i_client_clockref, i_diff_date, i_drift ); #endif diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c index 9a007f11fe..144ce645e4 100644 --- a/modules/demux/asf/libasf.c +++ b/modules/demux/asf/libasf.c @@ -91,7 +91,7 @@ static int ASF_ReadObjectCommon( stream_t *s, asf_object_t *p_obj ) #ifdef ASF_DEBUG msg_Dbg( s, - "found object guid: " GUID_FMT " size:"I64Fd, + "found object guid: " GUID_FMT " size:%"PRId64, GUID_PRINT( p_common->i_object_id ), p_common->i_object_size ); #endif @@ -202,7 +202,7 @@ static int ASF_ReadObject_Data( stream_t *s, asf_object_t *p_obj ) #ifdef ASF_DEBUG msg_Dbg( s, "read \"data object\" file_id:" GUID_FMT " total data packet:" - I64Fd" reserved:%d", + "%"PRId64" reserved:%d", GUID_PRINT( p_data->i_file_id ), p_data->i_total_data_packets, p_data->i_reserved ); @@ -233,7 +233,7 @@ static int ASF_ReadObject_Index( stream_t *s, asf_object_t *p_obj ) #ifdef ASF_DEBUG msg_Dbg( s, "read \"index object\" file_id:" GUID_FMT - " index_entry_time_interval:"I64Fd" max_packet_count:%d " + " index_entry_time_interval:%"PRId64" max_packet_count:%d " "index_entry_count:%ld", GUID_PRINT( p_index->i_file_id ), p_index->i_index_entry_time_interval, @@ -290,8 +290,8 @@ static int ASF_ReadObject_file_properties( stream_t *s, asf_object_t *p_obj ) #ifdef ASF_DEBUG msg_Dbg( s, "read \"file properties object\" file_id:" GUID_FMT - " file_size:"I64Fd" creation_date:"I64Fd" data_packets_count:" - I64Fd" play_duration:"I64Fd" send_duration:"I64Fd" preroll:"I64Fd + " file_size:%"PRId64" creation_date:%"PRId64" data_packets_count:" + "%"PRId64" play_duration:%"PRId64" send_duration:%"PRId64" preroll:%"PRId64 " flags:%d min_data_packet_size:%d " " max_data_packet_size:%d max_bitrate:%d", GUID_PRINT( p_fp->i_file_id ), p_fp->i_file_size, @@ -434,7 +434,7 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj ) msg_Dbg( s, " - %s (%i bytes)", p_rec->psz_name, p_rec->i_data ); else - msg_Dbg( s, " - %s="I64Fd, + msg_Dbg( s, " - %s=%"PRId64, p_rec->psz_name, p_rec->i_val ); } #endif @@ -575,7 +575,7 @@ static int ASF_ReadObject_stream_properties( stream_t *s, asf_object_t *p_obj ) #ifdef ASF_DEBUG msg_Dbg( s, "read \"stream Properties object\" stream_type:" GUID_FMT - " error_correction_type:" GUID_FMT " time_offset:"I64Fd + " error_correction_type:" GUID_FMT " time_offset:%"PRId64 " type_specific_data_length:%d error_correction_data_length:%d" " flags:0x%x stream_number:%d", GUID_PRINT( p_sp->i_stream_type ), @@ -966,7 +966,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s, #ifdef ASF_DEBUG msg_Dbg( s, "read \"extended stream properties object\":" ); - msg_Dbg( s, " - start="I64Fd" end="I64Fd, + msg_Dbg( s, " - start=%"PRId64" end=%"PRId64, p_esp->i_start_time, p_esp->i_end_time ); msg_Dbg( s, " - data bitrate=%d buffer=%d initial fullness=%d", p_esp->i_data_bitrate, @@ -980,7 +980,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s, msg_Dbg( s, " - flags=0x%x", p_esp->i_flags ); msg_Dbg( s, " - stream number=%d language=%d", p_esp->i_stream_number, p_esp->i_language_index ); - msg_Dbg( s, " - average time per frame="I64Fd, + msg_Dbg( s, " - average time per frame=%"PRId64, p_esp->i_average_time_per_frame ); msg_Dbg( s, " - stream name count=%d", p_esp->i_stream_name_count ); for( i = 0; i < p_esp->i_stream_name_count; i++ ) @@ -1159,7 +1159,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s, else if( i_type == 4 ) { /* QWord */ - asprintf( &p_ec->ppsz_value[i], I64Fd, GetQWLE(p_data)); + asprintf( &p_ec->ppsz_value[i], "%"PRId64, GetQWLE(p_data)); } else if( i_type == 5 ) { @@ -1457,7 +1457,7 @@ static void ASF_ObjectDumpDebug( vlc_object_t *p_obj, str[i * 5] = '|'; } snprintf( str + 5*i_level, 1024, - "+ '%s' GUID "GUID_FMT" size:"I64Fu"pos:"I64Fu, + "+ '%s' GUID "GUID_FMT" size:%"PRIu64"pos:%"PRIu64, psz_name, GUID_PRINT( p_node->i_object_id ), p_node->i_object_size, p_node->i_object_pos ); diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 225b01019f..5cda679d60 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -1294,7 +1294,7 @@ static int Seek( demux_t *p_demux, mtime_t i_date, int i_percent ) demux_sys_t *p_sys = p_demux->p_sys; unsigned int i_stream; - msg_Dbg( p_demux, "seek requested: "I64Fd" seconds %d%%", + msg_Dbg( p_demux, "seek requested: %"PRId64" seconds %d%%", i_date / 1000000, i_percent ); if( p_sys->b_seekable ) @@ -1354,7 +1354,7 @@ static int Seek( demux_t *p_demux, mtime_t i_date, int i_percent ) i_date = AVI_GetPTS( p_stream ); /* TODO better support for i_samplesize != 0 */ - msg_Dbg( p_demux, "estimate date "I64Fd, i_date ); + msg_Dbg( p_demux, "estimate date %"PRId64, i_date ); } /* */ @@ -1368,7 +1368,7 @@ static int Seek( demux_t *p_demux, mtime_t i_date, int i_percent ) AVI_TrackSeek( p_demux, i_stream, i_date ); } p_sys->i_time = i_date; - msg_Dbg( p_demux, "seek: "I64Fd" seconds", p_sys->i_time /1000000 ); + msg_Dbg( p_demux, "seek: %"PRId64" seconds", p_sys->i_time /1000000 ); return VLC_SUCCESS; } else @@ -1776,7 +1776,7 @@ static int AVI_TrackSeek( demux_t *p_demux, } msg_Dbg( p_demux, - "old:"I64Fd" %s new "I64Fd, + "old:%"PRId64" %s new %"PRId64, i_oldpts, i_oldpts > i_date ? ">" : "<", i_date ); @@ -2538,7 +2538,7 @@ static mtime_t AVI_MovieGetLength( demux_t *p_demux ) i_length /= (mtime_t)1000000; /* in seconds */ msg_Dbg( p_demux, - "stream[%d] length:"I64Fd" (based on index)", + "stream[%d] length:%"PRId64" (based on index)", i, i_length ); i_maxlength = __MAX( i_maxlength, i_length ); diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c index fd3b7fce85..4d8a01962d 100644 --- a/modules/demux/avi/libavi.c +++ b/modules/demux/avi/libavi.c @@ -71,7 +71,7 @@ static int AVI_ChunkReadCommon( stream_t *s, avi_chunk_t *p_chk ) #ifdef AVI_DEBUG msg_Dbg( (vlc_object_t*)s, - "found Chunk fourcc:%8.8x (%4.4s) size:"I64Fd" pos:"I64Fd, + "found Chunk fourcc:%8.8x (%4.4s) size:%"PRId64" pos:%"PRId64, p_chk->common.i_chunk_fourcc, (char*)&p_chk->common.i_chunk_fourcc, p_chk->common.i_chunk_size, @@ -811,7 +811,7 @@ static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj, p_chk->common.i_chunk_fourcc == AVIFOURCC_LIST ) { sprintf( str + i_level * 5, - "%c %4.4s-%4.4s size:"I64Fu" pos:"I64Fu, + "%c %4.4s-%4.4s size:%"PRIu64" pos:%"PRIu64, i_level ? '+' : '*', (char*)&p_chk->common.i_chunk_fourcc, (char*)&p_chk->list.i_type, @@ -821,7 +821,7 @@ static void AVI_ChunkDumpDebug_level( vlc_object_t *p_obj, else { sprintf( str + i_level * 5, - "+ %4.4s size:"I64Fu" pos:"I64Fu, + "+ %4.4s size:%"PRIu64" pos:%"PRIu64, (char*)&p_chk->common.i_chunk_fourcc, p_chk->common.i_chunk_size, p_chk->common.i_chunk_pos ); diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c index bc0cd13d8f..63b203b225 100644 --- a/modules/demux/demuxdump.c +++ b/modules/demux/demuxdump.c @@ -146,7 +146,7 @@ static void Close( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; - msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file, + msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", p_sys->psz_file, p_sys->i_write / 1024 ); if( p_sys->p_file != stdout ) diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp index 4ef7a76654..cb81202bb6 100644 --- a/modules/demux/mkv.cpp +++ b/modules/demux/mkv.cpp @@ -2059,7 +2059,7 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, tk->i_last_dts = p_block->i_dts; #if 0 -msg_Dbg( p_demux, "block i_dts: "I64Fd" / i_pts: "I64Fd, p_block->i_dts, p_block->i_pts); +msg_Dbg( p_demux, "block i_dts: %"PRId64" / i_pts: %"PRId64, p_block->i_dts, p_block->i_pts); #endif if( strcmp( tk->psz_codec, "S_VOBSUB" ) ) { @@ -2104,13 +2104,13 @@ matroska_stream_c *demux_sys_t::AnalyseAllSegmentsFound( demux_t *p_demux, EbmlS #if LIBMATROSKA_VERSION >= 0x000800 if (uint64(doc_read_version) > 2) { - msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1 & 2", uint64(doc_read_version)); + msg_Err( p_demux, "This matroska file is needs version %"PRId64" and this VLC only supports version 1 & 2", uint64(doc_read_version)); return NULL; } #else if (uint64(doc_read_version) != 1) { - msg_Err( p_demux, "This matroska file is needs version "I64Fd" and this VLC only supports version 1", uint64(doc_read_version)); + msg_Err( p_demux, "This matroska file is needs version %"PRId64" and this VLC only supports version 1", uint64(doc_read_version)); return NULL; } #endif @@ -3373,7 +3373,7 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it int i_index; - msg_Dbg( p_demux, "seek request to "I64Fd" (%f%%)", i_date, f_percent ); + msg_Dbg( p_demux, "seek request to %"PRId64" (%f%%)", i_date, f_percent ); if( i_date < 0 && f_percent < 0 ) { msg_Warn( p_demux, "cannot seek nowhere !" ); @@ -3948,7 +3948,7 @@ void matroska_segment_c::LoadCues( ) ep->Up(); #if 0 - msg_Dbg( &sys.demuxer, " * added time="I64Fd" pos="I64Fd + msg_Dbg( &sys.demuxer, " * added time=%"PRId64" pos=%"PRId64 " track=%d bnum=%d", idx.i_time, idx.i_position, idx.i_track, idx.i_block_number ); #endif @@ -4147,17 +4147,17 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) { if( id == KaxCues::ClassInfos.GlobalId ) { - msg_Dbg( &sys.demuxer, "| | | = cues at "I64Fd, i_pos ); + msg_Dbg( &sys.demuxer, "| | | = cues at %"PRId64, i_pos ); i_cues_position = segment->GetGlobalPosition( i_pos ); } else if( id == KaxChapters::ClassInfos.GlobalId ) { - msg_Dbg( &sys.demuxer, "| | | = chapters at "I64Fd, i_pos ); + msg_Dbg( &sys.demuxer, "| | | = chapters at %"PRId64, i_pos ); i_chapters_position = segment->GetGlobalPosition( i_pos ); } else if( id == KaxTags::ClassInfos.GlobalId ) { - msg_Dbg( &sys.demuxer, "| | | = tags at "I64Fd, i_pos ); + msg_Dbg( &sys.demuxer, "| | | = tags at %"PRId64, i_pos ); i_tags_position = segment->GetGlobalPosition( i_pos ); } } @@ -4298,7 +4298,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) KaxTrackDefaultDuration &defd = *(KaxTrackDefaultDuration*)l; tk->i_default_duration = uint64(defd); - msg_Dbg( &sys.demuxer, "| | | + Track Default Duration="I64Fd, uint64(defd) ); + msg_Dbg( &sys.demuxer, "| | | + Track Default Duration=%"PRId64, uint64(defd) ); } else if( MKV_IS_ID( l, KaxTrackTimecodeScale ) ) { @@ -4341,7 +4341,7 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m ) tk->p_extra_data = (uint8_t*)malloc( tk->i_extra_data ); memcpy( tk->p_extra_data, cpriv.GetBuffer(), tk->i_extra_data ); } - msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size="I64Fd, cpriv.GetSize() ); + msg_Dbg( &sys.demuxer, "| | | + Track CodecPrivate size=%"PRId64, cpriv.GetSize() ); } else if( MKV_IS_ID( l, KaxCodecName ) ) { @@ -4728,7 +4728,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) i_timescale = uint64(tcs); - msg_Dbg( &sys.demuxer, "| | + TimecodeScale="I64Fd, + msg_Dbg( &sys.demuxer, "| | + TimecodeScale=%"PRId64, i_timescale ); } else if( MKV_IS_ID( l, KaxDuration ) ) @@ -4737,7 +4737,7 @@ void matroska_segment_c::ParseInfo( KaxInfo *info ) i_duration = mtime_t( double( dur ) ); - msg_Dbg( &sys.demuxer, "| | + Duration="I64Fd, + msg_Dbg( &sys.demuxer, "| | + Duration=%"PRId64, i_duration ); } else if( MKV_IS_ID( l, KaxMuxingApp ) ) @@ -5733,7 +5733,7 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) i_seek_time = p_indexes[i_idx].i_time; } - msg_Dbg( &sys.demuxer, "seek got "I64Fd" (%d%%)", + msg_Dbg( &sys.demuxer, "seek got %"PRId64" (%d%%)", i_seek_time, (int)( 100 * i_seek_position / stream_Size( sys.demuxer.s ) ) ); es.I_O().setFilePointer( i_seek_position, seek_beginning ); @@ -6657,7 +6657,7 @@ bool matroska_script_interpretor_c::Interpret( const binary * p_command, size_t chapter_item_c *p_chapter = sys.FindChapter( i_chapter_uid, p_segment ); if ( p_chapter == NULL ) - msg_Dbg( &sys.demuxer, "Chapter "I64Fd" not found", i_chapter_uid); + msg_Dbg( &sys.demuxer, "Chapter %"PRId64" not found", i_chapter_uid); else { if ( !p_chapter->EnterAndLeave( sys.p_current_segment->CurrentChapter() ) ) diff --git a/modules/demux/mod.c b/modules/demux/mod.c index c90ee38358..0bf08a3a80 100644 --- a/modules/demux/mod.c +++ b/modules/demux/mod.c @@ -232,7 +232,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_time = 1; p_sys->i_length = ModPlug_GetLength( p_sys->f ) * (int64_t)1000; - msg_Dbg( p_demux, "MOD loaded name=%s lenght="I64Fd"ms", + msg_Dbg( p_demux, "MOD loaded name=%s lenght=%"PRId64"ms", ModPlug_GetName( p_sys->f ), p_sys->i_length ); diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 5cac38888e..d66e173b47 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -224,10 +224,10 @@ int MP4_ReadBoxCommon( stream_t *p_stream, MP4_Box_t *p_box ) if( p_box->i_size ) { if MP4_BOX_TYPE_ASCII() - msg_Dbg( p_stream, "found Box: %4.4s size "I64Fd, + msg_Dbg( p_stream, "found Box: %4.4s size %"PRId64, (char*)&p_box->i_type, p_box->i_size ); else - msg_Dbg( p_stream, "found Box: c%3.3s size "I64Fd, + msg_Dbg( p_stream, "found Box: c%3.3s size %"PRId64, (char*)&p_box->i_type+1, p_box->i_size ); } #endif @@ -1209,7 +1209,7 @@ static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box ) p_box->data.p_sample_soun->i_bytes_per_frame = 0; p_box->data.p_sample_soun->i_bytes_per_sample = 0; - msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest="I64Fd")", + msg_Dbg( p_stream, "read box: \"soun\" mp4 or qt1/2 (rest=%"PRId64")", i_read ); stream_Seek( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 ); @@ -1698,7 +1698,7 @@ static int MP4_ReadBox_stdp( stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd, + msg_Dbg( p_stream, "read box: \"stdp\" entry-count %"PRId64, i_read / 2 ); #endif @@ -1759,7 +1759,7 @@ static int MP4_ReadBox_padb( stream_t *p_stream, MP4_Box_t *p_box ) } #ifdef MP4_VERBOSE - msg_Dbg( p_stream, "read box: \"stdp\" entry-count "I64Fd, + msg_Dbg( p_stream, "read box: \"stdp\" entry-count %"PRId64, i_read / 2 ); #endif diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 8fe860b085..174006b7e5 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -1378,7 +1378,7 @@ static int TrackCreateSamplesIndex( demux_t *p_demux, } } - msg_Dbg( p_demux, "track[Id 0x%x] read %d samples length:"I64Fd"s", + msg_Dbg( p_demux, "track[Id 0x%x] read %d samples length:%"PRId64"s", p_demux_track->i_track_ID, p_demux_track->i_sample_count, i_last_dts / p_demux_track->i_timescale ); @@ -1484,7 +1484,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_data_sample_soun_t *p_soun = p_sample->data.p_sample_soun; - msg_Warn( p_demux, "i_timescale ("I64Fu") != i_sampleratehi " + msg_Warn( p_demux, "i_timescale (%"PRIu64") != i_sampleratehi " "(%u), making both equal (report any problem).", p_track->i_timescale, p_soun->i_sampleratehi ); @@ -1772,7 +1772,7 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track, i_start += elst->i_media_time[p_track->i_elst]; } - msg_Dbg( p_demux, "elst (%d) gives "I64Fd"ms (movie)-> "I64Fd + msg_Dbg( p_demux, "elst (%d) gives %"PRId64"ms (movie)-> %"PRId64 "ms (track)", p_track->i_elst, i_mvt * 1000 / p_sys->i_timescale, i_start * 1000 / p_track->i_timescale ); @@ -2047,7 +2047,7 @@ static void MP4_TrackCreate( demux_t *p_demux, mp4_track_t *p_track, msg_Warn( p_demux, "elst box found" ); for( i = 0; i < elst->i_entry_count; i++ ) { - msg_Dbg( p_demux, " - [%d] duration="I64Fd"ms media time="I64Fd + msg_Dbg( p_demux, " - [%d] duration=%"PRId64"ms media time=%"PRId64 "ms) rate=%d.%d", i, elst->i_segment_duration[i] * 1000 / p_sys->i_timescale, elst->i_media_time[i] >= 0 ? diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c index 3b64ef6991..fe9441dd76 100644 --- a/modules/demux/ogg.c +++ b/modules/demux/ogg.c @@ -712,7 +712,7 @@ static void Ogg_DecodePacket( demux_t *p_demux, if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) ) { /* FIXME: the biggest hack I've ever done */ - msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd, + msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64, p_block->i_pts, p_block->i_dts ); msleep(10000); } @@ -1389,7 +1389,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this, content_type_string ); } - msg_Dbg( p_this, "AnxData packet info: "I64Fd" / "I64Fd", %d, ``%s''", + msg_Dbg( p_this, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''", granule_rate_numerator, granule_rate_denominator, p_stream->secondary_header_packets, content_type_string ); diff --git a/modules/demux/ps.c b/modules/demux/ps.c index ffb2706661..0b213d0ace 100644 --- a/modules/demux/ps.c +++ b/modules/demux/ps.c @@ -263,7 +263,7 @@ static void FindLength( demux_t *p_demux ) { p_sys->i_length = i_length; p_sys->i_time_track = i; - msg_Dbg( p_demux, "we found a length of: "I64Fd, p_sys->i_length ); + msg_Dbg( p_demux, "we found a length of: %"PRId64, p_sys->i_length ); } } } @@ -386,7 +386,7 @@ static int Demux( demux_t *p_demux ) if( !b_new && !p_sys->b_have_pack && tk->fmt.i_cat == AUDIO_ES && p_pkt->i_pts > 0 ) { /* A hack to sync the A/V on PES files. */ - msg_Dbg( p_demux, "force SCR: "I64Fd, p_pkt->i_pts ); + msg_Dbg( p_demux, "force SCR: %"PRId64, p_pkt->i_pts ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts ); } diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 8a450e7ebb..8e84154a99 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -911,7 +911,7 @@ static void Close( vlc_object_t *p_this ) /* If in dump mode, then close the file */ if( p_sys->b_file_out ) { - msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", + msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", p_sys->psz_file, p_sys->i_write / 1024 ); if( p_sys->p_file != stdout ) diff --git a/modules/demux/ty.c b/modules/demux/ty.c index d600c2f478..d704446a00 100644 --- a/modules/demux/ty.c +++ b/modules/demux/ty.c @@ -690,7 +690,7 @@ static int DemuxRecVideo( demux_t *p_demux, ty_rec_hdr_t *rec_hdr, block_t *p_bl //subrec_type, esOffset1); p_sys->lastVideoPTS = get_pts( &p_block_in->p_buffer[ esOffset1 + VIDEO_PTS_OFFSET ] ); - /*msg_Dbg(p_demux, "Video rec %d PTS "I64Fd, p_sys->i_cur_rec, + /*msg_Dbg(p_demux, "Video rec %d PTS %"PRId64, p_sys->i_cur_rec, p_sys->lastVideoPTS );*/ if (subrec_type != 0x06) { /* if we found a PES, and it's not type 6, then we're S2 */ @@ -1087,7 +1087,7 @@ static int ty_stream_seek_pct(demux_t *p_demux, double seek_pct) /* seek within the chunk to get roughly to where we want */ p_sys->i_cur_rec = (int) ((double) ((seek_pos % CHUNK_SIZE) / (double) (CHUNK_SIZE)) * p_sys->i_num_recs); - msg_Dbg(p_demux, "Seeked to file pos " I64Fd, seek_pos); + msg_Dbg(p_demux, "Seeked to file pos %"PRId64, seek_pos); msg_Dbg(p_demux, " (chunk %d, record %d)", p_sys->i_cur_chunk - 1, p_sys->i_cur_rec); diff --git a/modules/misc/logger.c b/modules/misc/logger.c index 1a09034bb3..b2d73a1540 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -467,7 +467,7 @@ static void DoRRD( intf_thread_t *p_intf ) lldiv_t dout = lldiv( p_intf->p_libvlc->p_stats->f_output_bitrate * 1000000, 1000 ); fprintf( p_intf->p_sys->p_rrd, - I64Fi":%lld.%03u:%lld.%03u:%lld.%03u\n", + "%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n", p_intf->p_sys->last_update/1000000, din.quot, (unsigned int)din.rem, ddm.quot, (unsigned int)ddm.rem, diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index 11182cfb7e..27bf61830e 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -1557,7 +1557,7 @@ static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl ) p = psz_sdp = malloc( i_size ); p += sprintf( p, "v=0\r\n" ); - p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n", + p += sprintf( p, "o=- %"PRId64" %d IN IP%c %s\r\n", p_media->i_sdp_id, p_media->i_sdp_version, ipv, ip ); if( *p_media->psz_session_name ) p += sprintf( p, "s=%s\r\n", p_media->psz_session_name ); diff --git a/modules/mux/avi.c b/modules/mux/avi.c index 58ddb33b48..fb5491a8ff 100644 --- a/modules/mux/avi.c +++ b/modules/mux/avi.c @@ -202,7 +202,7 @@ static void Close( vlc_object_t * p_this ) (uint64_t)p_stream->i_totalsize / (uint64_t)p_stream->i_duration; } - msg_Info( p_mux, "stream[%d] duration:"I64Fd" totalsize:"I64Fd + msg_Info( p_mux, "stream[%d] duration:%"PRId64" totalsize:%"PRId64 " frames:%d fps:%f kb/s:%d", i_stream, (int64_t)p_stream->i_duration / (int64_t)1000000, diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index dfa503b01a..cac4d72580 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -738,7 +738,7 @@ static int Open( vlc_object_t *p_this ) if( p_sys->i_shaping_delay <= 0 ) { msg_Err( p_mux, - "invalid shaping ("I64Fd"ms) resetting to 200ms", + "invalid shaping (%"PRId64"ms) resetting to 200ms", p_sys->i_shaping_delay / 1000 ); p_sys->i_shaping_delay = 200000; } @@ -749,7 +749,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_pcr_delay >= p_sys->i_shaping_delay ) { msg_Err( p_mux, - "invalid pcr delay ("I64Fd"ms) resetting to 70ms", + "invalid pcr delay (%"PRId64"ms) resetting to 70ms", p_sys->i_pcr_delay / 1000 ); p_sys->i_pcr_delay = 70000; } @@ -757,7 +757,7 @@ static int Open( vlc_object_t *p_this ) var_Get( p_mux, SOUT_CFG_PREFIX "dts-delay", &val ); p_sys->i_dts_delay = (int64_t)val.i_int * 1000; - msg_Dbg( p_mux, "shaping="I64Fd" pcr="I64Fd" dts_delay="I64Fd, + msg_Dbg( p_mux, "shaping=%"PRId64" pcr=%"PRId64" dts_delay=%"PRId64, p_sys->i_shaping_delay, p_sys->i_pcr_delay, p_sys->i_dts_delay ); var_Get( p_mux, SOUT_CFG_PREFIX "use-key-frames", &val ); @@ -1429,7 +1429,7 @@ static int Mux( sout_mux_t *p_mux ) p_stream->i_pes_length ) ) { msg_Warn( p_mux, "packet with too strange dts " - "(dts="I64Fd",old="I64Fd",pcr="I64Fd")", + "(dts=%"PRId64",old=%"PRId64",pcr=%"PRId64")", p_data->i_dts, p_stream->i_pes_dts, p_pcr_stream->i_pes_dts ); block_Release( p_data ); @@ -1818,7 +1818,7 @@ static void TSSchedule( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, i++; i_new_dts = i_pcr_dts + i_pcr_length * i / i_packet_count; } - msg_Dbg( p_mux, "adjusting rate at "I64Fd"/"I64Fd" (%d/%d)", + msg_Dbg( p_mux, "adjusting rate at %"PRId64"/%"PRId64" (%d/%d)", i_cut_dts - i_pcr_dts, i_pcr_length, new_chain.i_depth, p_chain_ts->i_depth ); if ( new_chain.i_depth ) @@ -1850,16 +1850,16 @@ static void TSDate( sout_mux_t *p_mux, sout_buffer_chain_t *p_chain_ts, / (uint64_t)(i_pcr_length / 1000); if ( p_sys->i_bitrate_max && p_sys->i_bitrate_max < i_bitrate ) { - msg_Warn( p_mux, "max bitrate exceeded at "I64Fd - " (%d bi/s for %d pkt in "I64Fd" us)", + msg_Warn( p_mux, "max bitrate exceeded at %"PRId64 + " (%d bi/s for %d pkt in %"PRId64" us)", i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(), i_bitrate, i_packet_count, i_pcr_length); } #if 0 else { - msg_Dbg( p_mux, "starting at "I64Fd - " (%d bi/s for %d packets in "I64Fd" us)", + msg_Dbg( p_mux, "starting at %"PRId64 + " (%d bi/s for %d packets in %"PRId64" us)", i_pcr_dts + p_sys->i_shaping_delay * 3 / 2 - mdate(), i_bitrate, i_packet_count, i_pcr_length); } diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c index 680cc0e7b0..6bf23c83ff 100644 --- a/modules/packetizer/h264.c +++ b/modules/packetizer/h264.c @@ -411,7 +411,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) break; } #if 0 - msg_Dbg( p_dec, "pts="I64Fd" dts="I64Fd, + msg_Dbg( p_dec, "pts=%"PRId64" dts=%"PRId64, p_pic->i_pts, p_pic->i_dts ); #endif diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c index fe26181b34..0c5361b9a0 100644 --- a/modules/packetizer/mpegvideo.c +++ b/modules/packetizer/mpegvideo.c @@ -528,7 +528,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) p_pic->i_length = p_sys->i_interpolated_dts - p_pic->i_dts; #if 0 - msg_Dbg( p_dec, "pic: type=%d dts="I64Fd" pts-dts="I64Fd, + msg_Dbg( p_dec, "pic: type=%d dts=%"PRId64" pts-dts=%"PRId64, p_sys->i_picture_type, p_pic->i_dts, p_pic->i_pts - p_pic->i_dts); #endif diff --git a/modules/packetizer/vc1.c b/modules/packetizer/vc1.c index 8ec6257f04..de44056a79 100644 --- a/modules/packetizer/vc1.c +++ b/modules/packetizer/vc1.c @@ -373,7 +373,7 @@ static block_t *ParseIDU( decoder_t *p_dec, block_t *p_frag ) /* We can interpolate dts/pts only if we have a frame rate */ if( p_dec->fmt_out.video.i_frame_rate != 0 && p_dec->fmt_out.video.i_frame_rate_base != 0 ) { - //msg_Dbg( p_dec, "-------------- XXX0 dts="I64Fd" pts="I64Fd" interpolated="I64Fd, p_pic->i_dts, p_pic->i_pts, p_sys->i_interpolated_dts ); + //msg_Dbg( p_dec, "-------------- XXX0 dts=%"PRId64" pts=%"PRId64" interpolated=%"PRId64, p_pic->i_dts, p_pic->i_pts, p_sys->i_interpolated_dts ); if( p_pic->i_dts <= 0 ) p_pic->i_dts = p_sys->i_interpolated_dts; @@ -387,7 +387,7 @@ static block_t *ParseIDU( decoder_t *p_dec, block_t *p_frag ) } p_sys->i_interpolated_dts = p_pic->i_dts; - //msg_Dbg( p_dec, "-------------- dts="I64Fd" pts="I64Fd, p_pic->i_dts, p_pic->i_pts ); + //msg_Dbg( p_dec, "-------------- dts=%"PRId64" pts=%"PRId64, p_pic->i_dts, p_pic->i_pts ); /* Reset context */ p_sys->p_frame = NULL; diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index beb50068cc..e24d5ac8cb 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -1222,7 +1222,7 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp) goto error; } - if ((sscanf (data, "%63s "I64Fu" "I64Fu" IN IP%u %1023s", + if ((sscanf (data, "%63s %"PRIu64" %"PRIu64" IN IP%u %1023s", p_sdp->username, &p_sdp->session_id, &p_sdp->session_version, &p_sdp->orig_ip_version, p_sdp->orig_host) != 5) diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c index 46531a0119..93da52618b 100644 --- a/modules/stream_out/bridge.c +++ b/modules/stream_out/bridge.c @@ -440,7 +440,7 @@ static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id, < p_bridge->pp_es[i]->i_last) ) { block_t *p_block = p_bridge->pp_es[i]->p_block; - msg_Dbg( p_stream, "dropping a packet (" I64Fd ")", + msg_Dbg( p_stream, "dropping a packet (%"PRId64 ")", mdate() - p_block->i_dts - p_sys->i_delay ); p_bridge->pp_es[i]->p_block = p_bridge->pp_es[i]->p_block->p_next; diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index 841110130a..159bedb92a 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -542,7 +542,7 @@ static int RtspHandler( rtsp_stream_t *rtsp, rtsp_stream_id_t *id, if( psz_session == NULL ) { ses = RtspClientNew( rtsp ); - snprintf( psz_sesbuf, sizeof( psz_sesbuf ), I64Fx, + snprintf( psz_sesbuf, sizeof( psz_sesbuf ), "%"PRIx64, ses->id ); psz_session = psz_sesbuf; } diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index ebecc19e58..ffa3954538 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -2192,7 +2192,7 @@ static int transcode_video_process( sout_stream_t *p_stream, mtime_t current_date = mdate(); if( current_date + 50000 > p_pic->date ) { - msg_Dbg( p_stream, "late picture skipped ("I64Fd")", + msg_Dbg( p_stream, "late picture skipped (%"PRId64")", current_date + 50000 - p_pic->date ); p_pic->pf_release( p_pic ); continue; diff --git a/modules/stream_out/transrate/transrate.c b/modules/stream_out/transrate/transrate.c index 3b0821b8c2..0727855d8c 100644 --- a/modules/stream_out/transrate/transrate.c +++ b/modules/stream_out/transrate/transrate.c @@ -108,7 +108,7 @@ static int Open( vlc_object_t *p_this ) if( p_sys->i_shaping_delay <= 0 ) { msg_Err( p_stream, - "invalid shaping ("I64Fd"ms) reseting to 500ms", + "invalid shaping (%"PRId64"ms) reseting to 500ms", p_sys->i_shaping_delay / 1000 ); p_sys->i_shaping_delay = 500000; } @@ -120,7 +120,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_mpeg4_matrix = 1; } - msg_Dbg( p_stream, "codec video %dkb/s max gop="I64Fd"us", + msg_Dbg( p_stream, "codec video %dkb/s max gop=%"PRId64"us", p_sys->i_vbitrate / 1024, p_sys->i_shaping_delay ); if( !p_sys->p_out ) diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 7de1e16791..f2e75cc540 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -558,7 +558,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) } else { - msg_Dbg( p_filter, "too late picture for %s (" I64Fd ")", + msg_Dbg( p_filter, "too late picture for %s (%"PRId64 ")", p_es->psz_id, date - p_es->p_picture->date - p_sys->i_delay ); break; diff --git a/modules/visualization/galaktos/init_cond.c b/modules/visualization/galaktos/init_cond.c index da35aa7800..059bbbc347 100644 --- a/modules/visualization/galaktos/init_cond.c +++ b/modules/visualization/galaktos/init_cond.c @@ -130,7 +130,7 @@ void init_cond_to_string(init_cond_t * init_cond) { case P_TYPE_DOUBLE: div = lldiv( init_cond->init_val.double_val * 1000000, 1000000 ); - sprintf(string, "%s="I64Fd".%06u\n", init_cond->param->name, div.quot, (unsigned int) div.rem ); + sprintf(string, "%s=%"PRId64".%06u\n", init_cond->param->name, div.quot, (unsigned int) div.rem ); break; default: return; diff --git a/modules/visualization/galaktos/preset.c b/modules/visualization/galaktos/preset.c index 955af1c034..f040804d58 100644 --- a/modules/visualization/galaktos/preset.c +++ b/modules/visualization/galaktos/preset.c @@ -890,7 +890,7 @@ void write_init(init_cond_t * init_cond) { else if (init_cond->param->type == P_TYPE_DOUBLE) { lldiv_t div = lldiv( init_cond->init_val.double_val * 1000000,1000000 ); - sprintf(s, "%s="I64Fd".%06u\n", init_cond->param->name, div.quot, + sprintf(s, "%s=%"PRId64".%06u\n", init_cond->param->name, div.quot, (unsigned int) div.rem ); } -- 2.39.2