[Ffmpeg-cvslog] r6692 - in trunk/libavformat: asf.c mov.c utils.c

[rathann]

Author: rathann
Date: Sat Oct 14 22:43:39 2006
New Revision: 6692

Modified:
   trunk/libavformat/asf.c
   trunk/libavformat/mov.c
   trunk/libavformat/utils.c

Log:
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.



Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c	(original)
+++ trunk/libavformat/asf.c	Sat Oct 14 22:43:39 2006
@@ -869,7 +869,7 @@
         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 @@
     //     }
 
         /* 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);

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Sat Oct 14 22:43:39 2006
@@ -1751,7 +1751,7 @@
     /* 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

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	(original)
+++ trunk/libavformat/utils.c	Sat Oct 14 22:43:39 2006
@@ -826,7 +826,7 @@
 
             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 @@
         }
     }
     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,