[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c, 1.354, 1.355 ffserver.c, 1.100, 1.101

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv19337

Modified Files:
	ffmpeg.c ffserver.c 
Log Message:
use PRIxN, %zd, %td formats where needed


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- ffmpeg.c	12 Oct 2005 23:38:39 -0000	1.354
+++ ffmpeg.c	12 Dec 2005 01:56:45 -0000	1.355
@@ -2045,7 +2045,7 @@
             if(ABS(delta) > 10LL*AV_TIME_BASE && !copy_ts){
                 input_files_ts_offset[ist->file_index]-= delta;
                 if (verbose > 2)
-                    fprintf(stderr, "timestamp discontinuity %lld, new offset= %lld\n", delta, input_files_ts_offset[ist->file_index]);
+                    fprintf(stderr, "timestamp discontinuity %"PRId64", new offset= %"PRId64"\n", delta, input_files_ts_offset[ist->file_index]);
                 for(i=0; i<file_table[file_index].nb_streams; i++){
                     int index= file_table[file_index].ist_index + i;
                     ist_table[index]->next_pts += delta;

Index: ffserver.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffserver.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- ffserver.c	13 Nov 2005 03:26:43 -0000	1.100
+++ ffserver.c	12 Dec 2005 01:56:45 -0000	1.101
@@ -329,7 +329,7 @@
     if (c->suppress_log) 
         return;
 
-    http_log("%s - - [%s] \"%s %s %s\" %d %lld\n", 
+    http_log("%s - - [%s] \"%s %s %s\" %d %"PRId64"\n", 
              inet_ntoa(c->from_addr.sin_addr), 
              ctime1(buf2), c->method, c->url, 
              c->protocol, (c->http_error ? c->http_error : 200), c->data_count);
@@ -1584,7 +1584,7 @@
     for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++) {
     }
 
-    url_fprintf(pb, "%lld%c", count, *s);
+    url_fprintf(pb, "%"PRId64"%c", count, *s);
 }
 
 static void compute_stats(HTTPContext *c)