# HG changeset patch
# User diego
# Date 1162420798 0
# Node ID daae66c038578bd2cdd455262555e0ce810629f7
# Parent  fb40acd09af3b5430c1815333b1f7fa00b1836f9
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

diff -r fb40acd09af3 -r daae66c03857 dvbsubdec.c
--- a/dvbsubdec.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/dvbsubdec.c	Wed Nov 01 22:39:58 2006 +0000
@@ -1493,7 +1493,7 @@
     int len, buf_pos = 0;
 
 #ifdef DEBUG
-    av_log(avctx, AV_LOG_INFO, "DVB parse packet pts=%Lx, lpts=%Lx, cpts=%Lx:\n",
+    av_log(avctx, AV_LOG_INFO, "DVB parse packet pts=%"PRIx64", lpts=%"PRIx64", cpts=%"PRIx64":\n",
             s->pts, s->last_pts, s->cur_frame_pts[s->cur_frame_start_index]);
 #endif
 
diff -r fb40acd09af3 -r daae66c03857 h263.c
--- a/h263.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/h263.c	Wed Nov 01 22:39:58 2006 +0000
@@ -5912,7 +5912,7 @@
         s->pb_field_time= (  ROUNDED_DIV(s->time, s->t_frame)
                            - ROUNDED_DIV(s->last_non_b_time - s->pp_time, s->t_frame))*2;
     }
-//av_log(s->avctx, AV_LOG_DEBUG, "last nonb %Ld last_base %d time %Ld pp %d pb %d t %d ppf %d pbf %d\n", s->last_non_b_time, s->last_time_base, s->time, s->pp_time, s->pb_time, s->t_frame, s->pp_field_time, s->pb_field_time);
+//av_log(s->avctx, AV_LOG_DEBUG, "last nonb %"PRId64" last_base %d time %"PRId64" pp %d pb %d t %d ppf %d pbf %d\n", s->last_non_b_time, s->last_time_base, s->time, s->pp_time, s->pb_time, s->t_frame, s->pp_field_time, s->pb_field_time);
 
     if(s->avctx->time_base.num)
         s->current_picture_ptr->pts= (s->time + s->avctx->time_base.num/2) / s->avctx->time_base.num;
@@ -5929,7 +5929,7 @@
             av_log(s->avctx, AV_LOG_ERROR, "vop not coded\n");
         return FRAME_SKIPPED;
     }
-//printf("time %d %d %d || %Ld %Ld %Ld\n", s->time_increment_bits, s->avctx->time_base.den, s->time_base,
+//printf("time %d %d %d || %"PRId64" %"PRId64" %"PRId64"\n", s->time_increment_bits, s->avctx->time_base.den, s->time_base,
 //s->time, s->last_non_b_time, s->last_non_b_time - s->pp_time);
     if (s->shape != BIN_ONLY_SHAPE && ( s->pict_type == P_TYPE
                           || (s->pict_type == S_TYPE && s->vol_sprite_usage==GMC_SPRITE))) {
diff -r fb40acd09af3 -r daae66c03857 h263dec.c
--- a/h263dec.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/h263dec.c	Wed Nov 01 22:39:58 2006 +0000
@@ -798,7 +798,7 @@
     avctx->frame_number = s->picture_number - 1;
 
 #ifdef PRINT_FRAME_TIME
-av_log(avctx, AV_LOG_DEBUG, "%Ld\n", rdtsc()-time);
+av_log(avctx, AV_LOG_DEBUG, "%"PRId64"\n", rdtsc()-time);
 #endif
 
     return get_consumed_bytes(s, buf_size);
diff -r fb40acd09af3 -r daae66c03857 imgresample.c
--- a/imgresample.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/imgresample.c	Wed Nov 01 22:39:58 2006 +0000
@@ -171,7 +171,7 @@
         src_pos += src_incr;\
 }
 
-#define DUMP(reg) movq_r2m(reg, tmp); printf(#reg "=%016Lx\n", tmp.uq);
+#define DUMP(reg) movq_r2m(reg, tmp); printf(#reg "=%016"PRIx64"\n", tmp.uq);
 
 /* XXX: do four pixels at a time */
 static void h_resample_fast4_mmx(uint8_t *dst, int dst_width,
diff -r fb40acd09af3 -r daae66c03857 mpegvideo.c
--- a/mpegvideo.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/mpegvideo.c	Wed Nov 01 22:39:58 2006 +0000
@@ -2333,7 +2333,7 @@
             if(s->avctx->frame_skip_threshold || s->avctx->frame_skip_factor){
                 if(s->picture_in_gop_number < s->gop_size && skip_check(s, s->input_picture[0], s->next_picture_ptr)){
                 //FIXME check that te gop check above is +-1 correct
-//av_log(NULL, AV_LOG_DEBUG, "skip %p %Ld\n", s->input_picture[0]->data[0], s->input_picture[0]->pts);
+//av_log(NULL, AV_LOG_DEBUG, "skip %p %"PRId64"\n", s->input_picture[0]->data[0], s->input_picture[0]->pts);
 
                     if(s->input_picture[0]->type == FF_BUFFER_TYPE_SHARED){
                         for(i=0; i<4; i++)
diff -r fb40acd09af3 -r daae66c03857 oggvorbis.c
--- a/oggvorbis.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/oggvorbis.c	Wed Nov 01 22:39:58 2006 +0000
@@ -334,7 +334,7 @@
     op->packet = buf;
     op->bytes  = buf_size;
 
-//    av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %lld %lld %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate);
+//    av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %"PRId64" %"PRId64" %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate);
 
 /*    for(i=0; i<op->bytes; i++)
       av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]);
diff -r fb40acd09af3 -r daae66c03857 parser.c
--- a/parser.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/parser.c	Wed Nov 01 22:39:58 2006 +0000
@@ -127,7 +127,7 @@
 
     /* WARNING: the returned index can be negative */
     index = s->parser->parser_parse(s, avctx, poutbuf, poutbuf_size, buf, buf_size);
-//av_log(NULL, AV_LOG_DEBUG, "parser: in:%lld, %lld, out:%lld, %lld, in:%d out:%d id:%d\n", pts, dts, s->last_pts, s->last_dts, buf_size, *poutbuf_size, avctx->codec_id);
+//av_log(NULL, AV_LOG_DEBUG, "parser: in:%"PRId64", %"PRId64", out:%"PRId64", %"PRId64", in:%d out:%d id:%d\n", pts, dts, s->last_pts, s->last_dts, buf_size, *poutbuf_size, avctx->codec_id);
     /* update the file pointer */
     if (*poutbuf_size) {
         /* fill the data for the current frame */
diff -r fb40acd09af3 -r daae66c03857 ppc/dsputil_ppc.c
--- a/ppc/dsputil_ppc.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/ppc/dsputil_ppc.c	Wed Nov 01 22:39:58 2006 +0000
@@ -101,7 +101,7 @@
       {
         if (perfdata[j][i][powerpc_data_num] != (unsigned long long)0)
           av_log(NULL, AV_LOG_INFO,
-                  " Function \"%s\" (pmc%d):\n\tmin: %llu\n\tmax: %llu\n\tavg: %1.2lf (%llu)\n",
+                  " Function \"%s\" (pmc%d):\n\tmin: %"PRIu64"\n\tmax: %"PRIu64"\n\tavg: %1.2lf (%"PRIu64")\n",
                   perfname[i],
                   j+1,
                   perfdata[j][i][powerpc_data_min],
diff -r fb40acd09af3 -r daae66c03857 snow.c
--- a/snow.c	Wed Nov 01 21:41:54 2006 +0000
+++ b/snow.c	Wed Nov 01 22:39:58 2006 +0000
@@ -4616,7 +4616,7 @@
                 for(x=0; x<width; x++){
                     int64_t d= buffer[0][x + y*width];
                     error += d*d;
-                    if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8lld ", d);
+                    if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9 && level==2) printf("%8"PRId64" ", d);
                 }
                 if(FFABS(height/2-y)<9 && level==2) printf("\n");
             }
@@ -4630,7 +4630,7 @@
     for(level=0; level<s.spatial_decomposition_count; level++){
         printf("  {");
         for(orientation=0; orientation<4; orientation++){
-            printf("%8lld,", errors[level][orientation]/g);
+            printf("%8"PRId64",", errors[level][orientation]/g);
         }
         printf("},\n");
     }
@@ -4669,7 +4669,7 @@
                 for(x=0; x<width; x++){
                     int64_t d= buffer[0][x + y*width];
                     error += d*d;
-                    if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9) printf("%8lld ", d);
+                    if(FFABS(width/2-x)<9 && FFABS(height/2-y)<9) printf("%8"PRId64" ", d);
                 }
                 if(FFABS(height/2-y)<9) printf("\n");
             }