[SCM] libav/experimental: fix some printf format specifiers

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 706da4af320bc212b537744460a8ded989b51256
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Jun 16 14:52:05 2007 +0000

    fix some printf format specifiers
    
    Originally committed as revision 9334 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 74ae89c..dde4dfb 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7077,7 +7077,7 @@ static int decode_slice(H264Context *h){
             eos = get_cabac_terminate( &h->cabac );
 
             if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 2) {
-                av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%d)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream);
+                av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%td)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream);
                 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
                 return -1;
             }
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 9638604..81e3cb4 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1099,7 +1099,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
             if (start_code < 0) {
                 goto the_end;
             } else {
-                av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr);
+                av_log(avctx, AV_LOG_DEBUG, "marker=%x avail_size_in_buf=%td\n", start_code, buf_end - buf_ptr);
 
                 if ((buf_end - buf_ptr) > s->buffer_size)
                 {
@@ -1136,7 +1136,7 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
                     }
                     init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8);
 
-                    av_log(avctx, AV_LOG_DEBUG, "escaping removed %d bytes\n",
+                    av_log(avctx, AV_LOG_DEBUG, "escaping removed %td bytes\n",
                            (buf_end - buf_ptr) - (dst - s->buffer));
                 }
                 else if(start_code == SOS && s->ls){
@@ -1310,7 +1310,7 @@ not_the_end:
         }
     }
 the_end:
-    av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %d bytes\n", buf_end - buf_ptr);
+    av_log(avctx, AV_LOG_DEBUG, "mjpeg decode frame unused %td bytes\n", buf_end - buf_ptr);
 //    return buf_end - buf_ptr;
     return buf_ptr - buf;
 }
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index bdcf0b7..fd71145 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -146,7 +146,7 @@ static int zmbv_decode_xor_8(ZmbvContext *c)
         prev += c->width * c->bh;
     }
     if(src - c->decomp_buf != c->decomp_len)
-        av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len);
+        av_log(c->avctx, AV_LOG_ERROR, "Used %ti of %i bytes\n", src-c->decomp_buf, c->decomp_len);
     return 0;
 }
 
@@ -219,7 +219,7 @@ static int zmbv_decode_xor_16(ZmbvContext *c)
         prev += c->width * c->bh;
     }
     if(src - c->decomp_buf != c->decomp_len)
-        av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len);
+        av_log(c->avctx, AV_LOG_ERROR, "Used %ti of %i bytes\n", src-c->decomp_buf, c->decomp_len);
     return 0;
 }
 
@@ -375,7 +375,7 @@ static int zmbv_decode_xor_32(ZmbvContext *c)
         prev += c->width * c->bh;
     }
     if(src - c->decomp_buf != c->decomp_len)
-        av_log(c->avctx, AV_LOG_ERROR, "Used %i of %i bytes\n", src-c->decomp_buf, c->decomp_len);
+        av_log(c->avctx, AV_LOG_ERROR, "Used %ti of %i bytes\n", src-c->decomp_buf, c->decomp_len);
     return 0;
 }
 
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 158e84f..0f5c85d 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -639,7 +639,7 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, in
     uint64_t tmp;
 
     if(url_ftell(bc) > nut->last_syncpoint_pos + nut->max_distance){
-        av_log(s, AV_LOG_ERROR, "last frame must have been damaged %Ld > %Ld + %d\n", url_ftell(bc), nut->last_syncpoint_pos, nut->max_distance);
+        av_log(s, AV_LOG_ERROR, "last frame must have been damaged %"PRId64" > %"PRId64" + %d\n", url_ftell(bc), nut->last_syncpoint_pos, nut->max_distance);
         return -1;
     }
 
@@ -798,7 +798,7 @@ resync:
     *pos_arg = pos-1;
     assert(nut->last_syncpoint_pos == *pos_arg);
 
-    av_log(s, AV_LOG_DEBUG, "return %Ld %Ld\n", pts,back_ptr );
+    av_log(s, AV_LOG_DEBUG, "return %"PRId64" %"PRId64"\n", pts,back_ptr );
     if     (stream_index == -1) return pts;
     else if(stream_index == -2) return back_ptr;
 
@@ -823,7 +823,7 @@ static int read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flag
         ts  = st->index_entries[index].timestamp;
     }else{
         av_tree_find(nut->syncpoints, &dummy, sp_pts_cmp, next_node);
-        av_log(s, AV_LOG_DEBUG, "%Ld-%Ld %Ld-%Ld\n", next_node[0]->pos, next_node[1]->pos,
+        av_log(s, AV_LOG_DEBUG, "%"PRIu64"-%"PRIu64" %"PRId64"-%"PRId64"\n", next_node[0]->pos, next_node[1]->pos,
                                                     next_node[0]->ts , next_node[1]->ts);
         pos= av_gen_search(s, -1, dummy.ts, next_node[0]->pos, next_node[1]->pos, next_node[1]->pos,
                                             next_node[0]->ts , next_node[1]->ts, AVSEEK_FLAG_BACKWARD, &ts, nut_read_timestamp);

-- 
Libav/FFmpeg packaging