Use proper PRI?64 macros for %ll? format to fix printf format warnings:

utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:833: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 5 has type ‘int64_t’
utils.c:854: warning: format ‘%lld’ expects type ‘long long int’, but argument 6 has type ‘int64_t’
asf.c:872: warning: format ‘%Lx’ expects type ‘long long unsigned int’, but argument 4 has type ‘int64_t’
mov.c:1754: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 5 has type ‘int64_t’

Approved by Michael.

Originally committed as revision 6692 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 69c5e19..33ae66c 100644 (file)
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -869,7 +869,7 @@ static void asf_build_simple_index(AVFormatContext *s, int stream_index)
         itime=get_le64(&s->pb);
         pct=get_le32(&s->pb);
         ict=get_le32(&s->pb);
-        av_log(NULL, AV_LOG_DEBUG, "itime:0x%Lx, pct:%d, ict:%d\n",itime,pct,ict);
+        av_log(NULL, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict);
 
         for (i=0;i<ict;i++){
             int pktnum=get_le32(&s->pb);
@@ -933,7 +933,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int
     //     }
 
         /* do the seek */
-        av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %Ld\n", pos);
+        av_log(NULL, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos);
         url_fseek(&s->pb, pos, SEEK_SET);
     }
     asf_reset_header(s);

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7cbfbbc..09d8cd7 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1751,7 +1751,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
     /* must be done just before reading, to avoid infinite loop on sample */
     sc->current_sample++;
     if (sample->pos >= url_fsize(&s->pb)) {
-        av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%llx: partial file\n", sc->ffindex, sample->pos);
+        av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", sc->ffindex, sample->pos);
         return -1;
     }
 #ifdef CONFIG_DV_DEMUXER

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 29b09cf..efe0755 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -826,7 +826,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
 
             st = s->streams[s->cur_pkt.stream_index];
             if(st->codec->debug & FF_DEBUG_PTS)
-                av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%lld, dts=%lld, size=%d\n",
+                av_log(s, AV_LOG_DEBUG, "av_read_packet stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
                     s->cur_pkt.stream_index,
                     s->cur_pkt.pts,
                     s->cur_pkt.dts,
@@ -847,7 +847,7 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
         }
     }
     if(st->codec->debug & FF_DEBUG_PTS)
-        av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%lld, dts=%lld, size=%d\n",
+        av_log(s, AV_LOG_DEBUG, "av_read_frame_internal stream=%d, pts=%"PRId64", dts=%"PRId64", size=%d\n",
             pkt->stream_index,
             pkt->pts,
             pkt->dts,