[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec 4xm.c, 1.15, 1.16 dvdsubenc.c, 1.1, 1.2 h263.c, 1.291, 1.292 h264.c, 1.167, 1.168 huffyuv.c, 1.62, 1.63 interplayvideo.c, 1.12, 1.13 mpegvideo.c, 1.490, 1.491 opt.c, 1.9, 1.10 vorbis.c, 1.11, 1.12

Måns Rullgård CVS mru
Mon Dec 12 02:56:49 CET 2005


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

Modified Files:
	4xm.c dvdsubenc.c h263.c h264.c huffyuv.c interplayvideo.c 
	mpegvideo.c opt.c vorbis.c 
Log Message:
use PRIxN, %zd, %td formats where needed


Index: 4xm.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/4xm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- 4xm.c	24 Apr 2005 17:21:07 -0000	1.15
+++ 4xm.c	12 Dec 2005 01:56:45 -0000	1.16
@@ -355,7 +355,7 @@
     }
     
     if(bitstream_size != (get_bits_count(&f->gb)+31)/32*4)
-        av_log(f->avctx, AV_LOG_ERROR, " %d %d %d bytes left\n", 
+        av_log(f->avctx, AV_LOG_ERROR, " %d %td %td bytes left\n", 
             bitstream_size - (get_bits_count(&f->gb)+31)/32*4, 
             bytestream_size - (f->bytestream - (buf + 20 + bitstream_size + wordstream_size)),
             wordstream_size - (((uint8_t*)f->wordstream) - (buf + 20 + bitstream_size))

Index: dvdsubenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dvdsubenc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dvdsubenc.c	14 Nov 2005 22:17:29 -0000	1.1
+++ dvdsubenc.c	12 Dec 2005 01:56:45 -0000	1.2
@@ -208,7 +208,7 @@
     qq = outbuf;
     putbe16(&qq, q - outbuf);
     
-    av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%d\n", q - outbuf);
+    av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%td\n", q - outbuf);
     return q - outbuf;
 }
 

Index: h263.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- h263.c	19 Sep 2005 12:03:51 -0000	1.291
+++ h263.c	12 Dec 2005 01:56:45 -0000	1.292
@@ -5861,7 +5861,7 @@
     else
         s->current_picture_ptr->pts= AV_NOPTS_VALUE;
     if(s->avctx->debug&FF_DEBUG_PTS)
-        av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %Ld\n", s->current_picture_ptr->pts);
+        av_log(s->avctx, AV_LOG_DEBUG, "MPEG4 PTS: %"PRId64"\n", s->current_picture_ptr->pts);
 
     check_marker(gb, "before vop_coded");
     

Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- h264.c	11 Dec 2005 02:16:21 -0000	1.167
+++ h264.c	12 Dec 2005 01:56:45 -0000	1.168
@@ -398,7 +398,7 @@
     w      *= size;
     stride *= size;
     
-    assert((((int)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
+    assert((((long)vp)&(FFMIN(w, STRIDE_ALIGN)-1)) == 0);
     assert((stride&(w-1))==0);
 //FIXME check what gcc generates for 64 bit on x86 and possibly write a 32 bit ver of it
     if(w==2 && h==2){

Index: huffyuv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/huffyuv.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- huffyuv.c	8 May 2005 20:15:42 -0000	1.62
+++ huffyuv.c	12 Dec 2005 01:56:45 -0000	1.63
@@ -1188,7 +1188,7 @@
         char *end= p + 1024*30;
         for(i=0; i<3; i++){
             for(j=0; j<256; j++){
-                snprintf(p, end-p, "%llu ", s->stats[i][j]);
+                snprintf(p, end-p, "%"PRIu64" ", s->stats[i][j]);
                 p+= strlen(p);
                 s->stats[i][j]= 0;
             }

Index: interplayvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/interplayvideo.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- interplayvideo.c	21 Feb 2005 17:52:23 -0000	1.12
+++ interplayvideo.c	12 Dec 2005 01:56:45 -0000	1.13
@@ -846,7 +846,7 @@
     }
     if ((s->stream_ptr != s->stream_end) &&
         (s->stream_ptr + 1 != s->stream_end)) {
-        av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %d bytes left over\n",
+        av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %td bytes left over\n",
             s->stream_end - s->stream_ptr);
     }
 }

Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -d -r1.490 -r1.491
--- mpegvideo.c	7 Dec 2005 18:21:16 -0000	1.490
+++ mpegvideo.c	12 Dec 2005 01:56:45 -0000	1.491
@@ -2020,7 +2020,7 @@
                 int64_t last= s->user_specified_pts;
             
                 if(time <= last){            
-                    av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%Ld, last=%Ld\n", pts, s->user_specified_pts);
+                    av_log(s->avctx, AV_LOG_ERROR, "Error, Invalid timestamp=%"PRId64", last=%"PRId64"\n", pts, s->user_specified_pts);
                     return -1;
                 }
             }
@@ -2029,7 +2029,7 @@
             if(s->user_specified_pts != AV_NOPTS_VALUE){
                 s->user_specified_pts= 
                 pts= s->user_specified_pts + 1;
-                av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%Ld)\n", pts);
+                av_log(s->avctx, AV_LOG_INFO, "Warning: AVFrame.pts=? trying to guess (%"PRId64")\n", pts);
             }else{
                 pts= pic_arg->display_picture_number;
             }

Index: opt.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/opt.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- opt.c	20 Sep 2005 12:57:20 -0000	1.9
+++ opt.c	12 Dec 2005 01:56:46 -0000	1.10
@@ -181,7 +181,7 @@
     switch(o->type){
     case FF_OPT_TYPE_FLAGS:     snprintf(buf, buf_len, "0x%08X",*(int    *)dst);break;
     case FF_OPT_TYPE_INT:       snprintf(buf, buf_len, "%d" , *(int    *)dst);break;
-    case FF_OPT_TYPE_INT64:     snprintf(buf, buf_len, "%Ld", *(int64_t*)dst);break;
+    case FF_OPT_TYPE_INT64:     snprintf(buf, buf_len, "%"PRId64, *(int64_t*)dst);break;
     case FF_OPT_TYPE_FLOAT:     snprintf(buf, buf_len, "%f" , *(float  *)dst);break;
     case FF_OPT_TYPE_DOUBLE:    snprintf(buf, buf_len, "%f" , *(double *)dst);break;
     case FF_OPT_TYPE_RATIONAL:  snprintf(buf, buf_len, "%d/%d", ((AVRational*)dst)->num, ((AVRational*)dst)->den);break;

Index: vorbis.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/vorbis.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vorbis.c	30 May 2005 22:02:00 -0000	1.11
+++ vorbis.c	12 Dec 2005 01:56:46 -0000	1.12
@@ -208,18 +208,18 @@
         AV_DEBUG(" %d. Codebook \n", cb);
 
         if (get_bits(gb, 24)!=0x564342) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %d. Codebook setup data corrupt. \n", cb);
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook setup data corrupt. \n", cb);
             goto error;
         }
 
         codebook_setup->dimensions=get_bits(gb, 16);
         if (codebook_setup->dimensions>16) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %d. Codebook's dimension is too large (%d). \n", cb, codebook_setup->dimensions);
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is too large (%d). \n", cb, codebook_setup->dimensions);
             goto error;
         }
         entries=get_bits(gb, 24);
         if (entries>V_MAX_VLCS) {
-            av_log(vc->avccontext, AV_LOG_ERROR, " %d. Codebook has too many entries (%d). \n", cb, entries);
+            av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook has too many entries (%"PRIdFAST32"). \n", cb, entries);
             goto error;
         }
 





More information about the ffmpeg-cvslog mailing list