Fix a lot of format warnings in lprintf calls (mostly %ldd -> %"PRId64").

CVS patchset: 8608
CVS date: 2007/02/20 00:34:55

14 files changed, 73 insertions, 73 deletions

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index bd48d9466..067889ad5 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.192 2007/01/19 01:05:24 dgp85 Exp $
+ * $Id: demux_asf.c,v 1.193 2007/02/20 00:34:55 dgp85 Exp $
  *
  * demultiplexer for asf streams
  *
@@ -641,15 +641,15 @@ static void check_newpts (demux_asf_t *this, int64_t pts, int video, int frame_e
 #ifdef LOG
   if (pts) {
     if (video) {
-      printf ("demux_asf: VIDEO: pts = %8lld, diff = %8lld\n", pts, pts - this->last_pts[video]);
+      printf ("demux_asf: VIDEO: pts = %8"PRId64", diff = %8"PRId64"\n", pts, pts - this->last_pts[video]);
     } else {
-      printf ("demux_asf: AUDIO: pts = %8lld, diff = %8lld\n", pts, pts - this->last_pts[video]);
+      printf ("demux_asf: AUDIO: pts = %8"PRId64", diff = %8"PRId64"\n", pts, pts - this->last_pts[video]);
     }
   }
 #endif
   if (pts && (this->send_newpts || (this->last_pts[video] && abs(diff) > WRAP_THRESHOLD))) {
 
-    lprintf ("sending newpts %lld (video = %d diff = %lld)\n", pts, video, diff);
+    lprintf ("sending newpts %"PRId64" (video = %d diff = %"PRId64")\n", pts, video, diff);
 
     if (this->buf_flag_seek) {
       _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -676,7 +676,7 @@ static void asf_send_buffer_nodefrag (demux_asf_t *this, asf_demux_stream_t *str
   int            bufsize;
   int            package_done;
 
-  lprintf ("pts=%lld, off=%d, len=%d, total=%d\n",
+  lprintf ("pts=%"PRId64", off=%d, len=%d, total=%d\n",
            timestamp * 90, frag_offset, frag_len, stream->payload_size);
 
   if (frag_offset == 0) {
@@ -760,7 +760,7 @@ static void asf_send_buffer_defrag (demux_asf_t *this, asf_demux_stream_t *strea
     printf("asf_send_buffer seq=%d frag_offset=%d frag_len=%d\n",
     seq, frag_offset, frag_len );
   */
-  lprintf ("asf_send_buffer_defrag: timestamp=%lld, pts=%lld\n", timestamp, timestamp * 90);
+  lprintf ("asf_send_buffer_defrag: timestamp=%"PRId64", pts=%"PRId64"\n", timestamp, timestamp * 90);
 
   if (frag_offset == 0) {
     /* new packet */
@@ -866,11 +866,11 @@ static int asf_parse_packet_align(demux_asf_t *this) {
   
   /* check packet_count */
   packet_num = (packet_pos - this->first_packet_pos) / this->packet_size;
-  lprintf("packet_num=%lld, packet_count=%lld\n", packet_num, this->packet_count);
+  lprintf("packet_num=%"PRId64", packet_count=%"PRId64"\n", packet_num, this->packet_count);
   if (packet_num >= this->packet_count) {
     /* end of payload data */
     current_pos = this->input->get_current_pos (this->input);
-    lprintf("end of payload data, current_pos=%lld\n", current_pos);
+    lprintf("end of payload data, current_pos=%"PRId64"\n", current_pos);
     {
       /* check new asf header */
       if (get_guid(this) == GUID_ASF_HEADER) {
@@ -1000,7 +1000,7 @@ static int asf_parse_packet_payload_header(demux_asf_t *this, uint32_t p_hdr_siz
   timestamp = get_le32(this); p_hdr_size += 4;
   duration  = get_le16(this); p_hdr_size += 2;
 
-  lprintf ("timestamp=%lld, duration=%lld\n", timestamp, duration);
+  lprintf ("timestamp=%"PRId64", duration=%"PRId64"\n", timestamp, duration);
 
   if ((this->packet_len_flags >> 5) & 3) {
     /* absolute data size */
@@ -1790,7 +1790,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
   int            i, state;
   int64_t        ts;
 
-  lprintf ("demux_asf_seek: start_pos=%lld, start_time=%d\n",
+  lprintf ("demux_asf_seek: start_pos=%"PRId64", start_time=%d\n",
 	   start_pos, start_time);
 
   this->status = DEMUX_OK;
@@ -1911,13 +1911,13 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
             }
             state = 1; /* search an audio packet with pts < this->keyframe_pts */
 
-            lprintf ("demux_asf_seek: keyframe found at %lld, timestamp = %lld\n", start_pos, ts);
+            lprintf ("demux_asf_seek: keyframe found at %"PRId64", timestamp = %"PRId64"\n", start_pos, ts);
             check_newpts (this, ts * 90, 1, 0);
           }
         } else if (state == 1) {
           if ((this->audio_stream != -1 && stream_id == this->asf_header->streams[this->audio_stream]->stream_number) && ts &&
               (ts <= this->keyframe_ts)) {
-            lprintf ("demux_asf_seek: audio packet found at %lld, ts = %lld\n", start_pos, ts);
+            lprintf ("demux_asf_seek: audio packet found at %"PRId64", ts = %"PRId64"\n", start_pos, ts);
 
             state = 5; /* end */
             break;
@@ -1928,7 +1928,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
             this->keyframe_ts = ts;
             state = 5; /* end */
 
-            lprintf ("demux_asf_seek: audio packet found at %lld, timestamp = %lld\n", start_pos, ts);
+            lprintf ("demux_asf_seek: audio packet found at %"PRId64", timestamp = %"PRId64"\n", start_pos, ts);
             check_newpts (this, ts * 90, 0, 0);
           }
         }
@@ -1942,7 +1942,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
     } else {
       this->input->seek (this->input, start_pos + this->packet_size, SEEK_SET);
     }
-    lprintf ("demux_asf_seek: keyframe_found=%d, keyframe_ts=%lld\n",
+    lprintf ("demux_asf_seek: keyframe_found=%d, keyframe_ts=%"PRId64"\n",
              this->keyframe_found, this->keyframe_ts);
     if (this->video_stream >= 0) {
       this->streams[this->video_stream].resync = 1;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index e0ed1a915..86af5eec5 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_avi.c,v 1.229 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_avi.c,v 1.230 2007/02/20 00:34:55 dgp85 Exp $
  *
  * demultiplexer for avi streams
  *
@@ -1392,7 +1392,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
   AVI->video_posf = 0;
   AVI->video_posb = 0;
 
-  lprintf("done, pos=%lld, AVI->movi_start=%" PRIdMAX "\n", this->input->get_current_pos(this->input), (intmax_t)AVI->movi_start);
+  lprintf("done, pos=%"PRId64", AVI->movi_start=%" PRIdMAX "\n", this->input->get_current_pos(this->input), (intmax_t)AVI->movi_start);
   return AVI;
 }
 
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index f0bfe4c16..be86b32ed 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_elem.c,v 1.90 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_elem.c,v 1.91 2007/02/20 00:34:55 dgp85 Exp $
  *
  * demultiplexer for elementary mpeg streams
  */
@@ -73,7 +73,7 @@ static int demux_mpeg_elem_next (demux_mpeg_elem_t *this, int preview_mode) {
   buf = this->video_fifo->buffer_pool_alloc(this->video_fifo);
   blocksize = (this->blocksize ? this->blocksize : buf->max_size);
   done = this->input->read(this->input, buf->mem, blocksize);
-  lprintf ("read size = %lld\n", done);
+  lprintf ("read size = %"PRId64"\n", done);
 
   if (done <= 0) {
     buf->free_buffer (buf);
@@ -160,7 +160,7 @@ static int demux_mpeg_elem_seek (demux_plugin_t *this_gen,
       this->status = DEMUX_FINISHED;
       return this->status;
     }
-    lprintf ("seeking to %lld\n", start_pos);
+    lprintf ("seeking to %"PRId64"\n", start_pos);
   }
 
   /*
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 0af3ef8f4..ce6f30165 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -23,7 +23,7 @@
  * For more information on the FLAC file format, visit:
  *   http://flac.sourceforge.net/
  *
- * $Id: demux_flac.c,v 1.13 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_flac.c,v 1.14 2007/02/20 00:34:55 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -166,7 +166,7 @@ static int open_flac_file(demux_flac_t *flac) {
       flac->bits_per_sample = ((flac->sample_rate >> 4) & 0x1F) + 1;
       flac->sample_rate >>= 12;
       flac->total_samples = BE_64(&streaminfo[10]) & UINT64_C(0x0FFFFFFFFF);  /* 36 bits */
-      lprintf ("%d Hz, %d bits, %d channels, %lld total samples\n", 
+      lprintf ("%d Hz, %d bits, %d channels, %"PRId64" total samples\n", 
         flac->sample_rate, flac->bits_per_sample, 
         flac->channels, flac->total_samples);
       break;
@@ -193,15 +193,15 @@ static int open_flac_file(demux_flac_t *flac) {
         if (flac->input->read(flac->input, buffer, FLAC_SEEKPOINT_SIZE) != FLAC_SEEKPOINT_SIZE)
           return 0;
         flac->seekpoints[i].sample_number = BE_64(&buffer[0]);
-        lprintf (" %d: sample %lld, ", i, flac->seekpoints[i].sample_number);
+        lprintf (" %d: sample %"PRId64", ", i, flac->seekpoints[i].sample_number);
         flac->seekpoints[i].offset = BE_64(&buffer[8]);
         flac->seekpoints[i].size = BE_16(&buffer[16]);
-        lprintf ("@ 0x%llX, size = %d bytes, ", 
+        lprintf ("@ 0x%"PRIX64", size = %d bytes, ", 
           flac->seekpoints[i].offset, flac->seekpoints[i].size);
         flac->seekpoints[i].pts = flac->seekpoints[i].sample_number;
         flac->seekpoints[i].pts *= 90000;
         flac->seekpoints[i].pts /= flac->sample_rate;
-        lprintf ("pts = %lld\n", flac->seekpoints[i].pts);
+        lprintf ("pts = %"PRId64"\n", flac->seekpoints[i].pts);
       }
       break;
 
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index 129fb40fb..9efe1b182 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -26,7 +26,7 @@
  * For more information on the FLV file format, visit:
  * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf
  *
- * $Id: demux_flv.c,v 1.18 2007/01/22 17:07:08 klan Exp $
+ * $Id: demux_flv.c,v 1.19 2007/02/20 00:34:55 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -138,10 +138,10 @@ static void check_newpts(demux_flv_t *this, int64_t pts, int video) {
   int64_t diff;
 
   diff = pts - this->last_pts[video];
-  lprintf ("check_newpts %lld\n", pts);
+  lprintf ("check_newpts %"PRId64"\n", pts);
 
   if (pts && (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD))) {
-    lprintf ("diff=%lld\n", diff);
+    lprintf ("diff=%"PRId64"\n", diff);
 
     if (this->buf_flag_seek) {
       _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -303,7 +303,7 @@ static int parse_flv_var(demux_flv_t *this, unsigned char *buf, int size, char *
       }
       break;
     case FLV_DATA_TYPE_DATE:
-      lprintf("  got date (%lld, %d)\n", BE_64(tmp), BE_16(tmp+8));
+      lprintf("  got date (%"PRId64", %d)\n", BE_64(tmp), BE_16(tmp+8));
       tmp += 10;
       break;
     default:
@@ -358,7 +358,7 @@ static int read_flv_packet(demux_flv_t *this) {
     remaining_bytes = BE_24(&buffer[1]);
     pts = BE_24(&buffer[4]) | (buffer[7] << 24);
     
-    lprintf("  tag_type = 0x%02X, 0x%X bytes, pts %lld\n",
+    lprintf("  tag_type = 0x%02X, 0x%X bytes, pts %"PRId64"\n",
             tag_type, remaining_bytes, pts/90);
 
     switch (tag_type) {
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 8397e3e6d..461771425 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -65,7 +65,7 @@
  *     - if any bytes exceed 63, do not shift the bytes at all before
  *       transmitting them to the video decoder
  *
- * $Id: demux_idcin.c,v 1.54 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_idcin.c,v 1.55 2007/02/20 00:34:55 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -222,7 +222,7 @@ static int demux_idcin_send_chunk(demux_plugin_t *this_gen) {
     if (!remaining_sample_bytes)
       buf->decoder_flags |= BUF_FLAG_FRAME_END;
 
-    lprintf("sending video buf with %d bytes, %lld pts\n", buf->size, buf->pts);
+    lprintf("sending video buf with %d bytes, %"PRId64" pts\n", buf->size, buf->pts);
     this->video_fifo->put(this->video_fifo, buf);
   }
 
@@ -263,7 +263,7 @@ static int demux_idcin_send_chunk(demux_plugin_t *this_gen) {
       if (!remaining_sample_bytes)
         buf->decoder_flags |= BUF_FLAG_FRAME_END;
 
-      lprintf("sending audio buf with %d bytes, %lld pts\n", buf->size, buf->pts);
+      lprintf("sending audio buf with %d bytes, %"PRId64" pts\n", buf->size, buf->pts);
       this->audio_fifo->put(this->audio_fifo, buf);
     }
   }
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index 992612f62..6fe185b1a 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -23,7 +23,7 @@
  * For more information regarding the Interplay MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_ipmovie.c,v 1.26 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_ipmovie.c,v 1.27 2007/02/20 00:34:55 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -326,7 +326,7 @@ static int process_ipmovie_chunk(demux_ipmovie_t *this) {
         audio_pts *= this->audio_frame_count;
         audio_pts /= this->wave.nSamplesPerSec;
 
-        lprintf("sending audio frame with pts %lld (%d audio frames)\n",
+        lprintf("sending audio frame with pts %"PRId64" (%d audio frames)\n",
           audio_pts, this->audio_frame_count);
 
         if(this->audio_fifo) {
@@ -432,7 +432,7 @@ static int process_ipmovie_chunk(demux_ipmovie_t *this) {
         lprintf("set video data\n");
 
         current_file_pos = this->input->get_current_pos(this->input);
-        lprintf("sending video data with pts %lld\n",
+        lprintf("sending video data with pts %"PRId64"\n",
           this->video_pts);
 
         /* send off any new palette data */
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 39b887d54..3cc36942a 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_matroska.c,v 1.51 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_matroska.c,v 1.52 2007/02/20 00:34:55 dgp85 Exp $
  *
  * demultiplexer for matroska streams
  *
@@ -1257,7 +1257,7 @@ static int parse_track_entry(demux_matroska_t *this, matroska_track_t *track) {
         if (!ebml_read_uint(ebml, &elem, &val))
           return 0;
         track->default_duration = val;
-        lprintf("Default Duration: %lld\n", track->default_duration);
+        lprintf("Default Duration: %"PRIu64"\n", track->default_duration);
       }
       break;
 
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 1ed0addcf..c9d49efa2 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_mpeg.c,v 1.151 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_mpeg.c,v 1.152 2007/02/20 00:34:55 dgp85 Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -310,7 +310,7 @@ static void parse_mpeg2_packet (demux_mpeg_t *this, int stream_id, int64_t scr)
         check_newpts( this, this->pts, PTS_VIDEO );
       */
       this->video_fifo->put (this->video_fifo, buf);
-      lprintf ("SPU SVCD PACK (pts: %lld, spu id: %d) put on FIFO\n", 
+      lprintf ("SPU SVCD PACK (pts: %"PRId64", spu id: %d) put on FIFO\n", 
 	       buf->pts, spu_id);
 
       return;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index e149e027a..7083d33d9 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.219 2007/01/19 01:05:24 dgp85 Exp $
+ * $Id: demux_mpeg_block.c,v 1.220 2007/02/20 00:34:55 dgp85 Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * used with fixed blocksize devices (like dvd/vcd)
@@ -458,7 +458,7 @@ static int32_t parse_program_stream_pack_header(demux_mpeg_block_t *this, uint8_
     this->scr += ( (p[8] & 0x03 << 7) | (p[9] & 0xFE >> 1) );
     */
 
-    lprintf ("SCR=%lld\n", this->scr);
+    lprintf ("SCR=%"PRId64"\n", this->scr);
 
     /* mux_rate */
 
@@ -525,7 +525,7 @@ static int32_t parse_private_stream_2(demux_mpeg_block_t *this, uint8_t *p, buf_
     this->last_begin_time = buf->extra_info->input_time;
   }
     
-  lprintf ("NAV packet, start pts = %lld, end_pts = %lld\n",
+  lprintf ("NAV packet, start pts = %"PRId64", end_pts = %"PRId64"\n",
            start_pts, end_pts);
 
   if (this->nav_last_end_pts != start_pts && !this->preview_mode) {
@@ -664,7 +664,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_block_t *this, uint8_t *p, buf_eleme
       this->pts |=  p[12]         <<  7 ;
       this->pts |= (p[13] & 0xFE) >>  1 ;
 
-      lprintf ("pts = %lld\n", this->pts);
+      lprintf ("pts = %"PRId64"\n", this->pts);
 
     } else
       this->pts = 0;
@@ -731,7 +731,7 @@ static int32_t parse_private_stream_1(demux_mpeg_block_t *this, uint8_t *p, buf_
         check_newpts( this, this->pts, PTS_VIDEO );
       */
       this->video_fifo->put (this->video_fifo, buf);    
-      lprintf ("SPU SVCD PACK (%lld, %d) put on fifo\n", this->pts, spu_id);
+      lprintf ("SPU SVCD PACK (%"PRId64", %d) put on fifo\n", this->pts, spu_id);
       
       return -1;
     }
@@ -749,7 +749,7 @@ static int32_t parse_private_stream_1(demux_mpeg_block_t *this, uint8_t *p, buf_
         check_newpts( this, this->pts, PTS_VIDEO );
       */      
       this->video_fifo->put (this->video_fifo, buf);    
-      lprintf ("SPU CVD PACK (%lld, %d) put on fifo\n", this->pts, spu_id);
+      lprintf ("SPU CVD PACK (%"PRId64", %d) put on fifo\n", this->pts, spu_id);
       
       return -1;
     }
@@ -1146,7 +1146,7 @@ static int demux_mpeg_block_estimate_rate (demux_mpeg_block_t *this) {
 	count ++;
 	
 	/*
-	printf ("demux_mpeg_block: stream_id %02x, pos: %lld, pts: %d, cur_rate = %d, overall rate : %d\n", 
+	printf ("demux_mpeg_block: stream_id %02x, pos: %"PRId64", pts: %d, cur_rate = %d, overall rate : %d\n", 
 		stream_id, pos, pts, cur_rate, rate); 
 	*/
       }
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 0e0a3501d..3eceb8fa7 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_pes.c,v 1.39 2007/01/19 01:05:24 dgp85 Exp $
+ * $Id: demux_mpeg_pes.c,v 1.40 2007/02/20 00:34:56 dgp85 Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -572,7 +572,7 @@ static int32_t parse_program_stream_pack_header(demux_mpeg_pes_t *this, uint8_t
     this->scr += ( (p[8] & 0x03 << 7) | (p[9] & 0xFE >> 1) );
     */
 
-    lprintf ("SCR=%lld\n", this->scr);
+    lprintf ("SCR=%"PRId64"\n", this->scr);
 
     /* mux_rate */
 
@@ -649,7 +649,7 @@ static int32_t parse_private_stream_2(demux_mpeg_pes_t *this, uint8_t *p, buf_el
     this->last_begin_time = buf->extra_info->input_time;
   }
     
-  lprintf ("NAV packet, start pts = %lld, end_pts = %lld\n",
+  lprintf ("NAV packet, start pts = %"PRId64", end_pts = %"PRId64"\n",
            start_pts, end_pts);
 
   if (this->nav_last_end_pts != start_pts && !this->preview_mode) {
@@ -795,7 +795,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_pes_t *this, uint8_t *p, buf_element
       this->pts |= (int64_t)  p[12]         <<  7 ;
       this->pts |= (int64_t) (p[13] & 0xFE) >>  1 ;
 
-      lprintf ("pts = %lld\n", this->pts);
+      lprintf ("pts = %"PRId64"\n", this->pts);
 
     } else
       this->pts = 0;
@@ -862,7 +862,7 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el
         check_newpts( this, this->pts, PTS_VIDEO );
       */
       this->video_fifo->put (this->video_fifo, buf);    
-      lprintf ("SPU SVCD PACK (%lld, %d) put on fifo\n", this->pts, spu_id);
+      lprintf ("SPU SVCD PACK (%"PRId64", %d) put on fifo\n", this->pts, spu_id);
       
       return this->packet_len + result;
     }
@@ -880,7 +880,7 @@ static int32_t parse_private_stream_1(demux_mpeg_pes_t *this, uint8_t *p, buf_el
         check_newpts( this, this->pts, PTS_VIDEO );
       */      
       this->video_fifo->put (this->video_fifo, buf);    
-      lprintf ("SPU CVD PACK (%lld, %d) put on fifo\n", this->pts, spu_id);
+      lprintf ("SPU CVD PACK (%"PRId64", %d) put on fifo\n", this->pts, spu_id);
       
       return this->packet_len + result;
     }
@@ -1283,7 +1283,7 @@ static int demux_mpeg_pes_estimate_rate (demux_mpeg_pes_t *this) {
 	count ++;
 	
 	/*
-	printf ("demux_mpeg_pes: stream_id %02x, pos: %lld, pts: %d, cur_rate = %d, overall rate : %d\n", 
+	printf ("demux_mpeg_pes: stream_id %02x, pos: %"PRId64", pts: %d, cur_rate = %d, overall rate : %d\n", 
 		stream_id, pos, pts, cur_rate, rate); 
 	*/
       }
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 346ed4093..452c53703 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.147 2007/02/03 23:56:32 dsalt Exp $
+ * $Id: demux_mpgaudio.c,v 1.148 2007/02/20 00:34:56 dgp85 Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -437,7 +437,7 @@ static vbri_header_t* parse_vbri_header(mpg_audio_frame_t *frame,
       for (i = 0; i <= vbri->toc_entries; i++) {
         toc_stream_size += vbri->toc[i];
       }
-      lprintf("stream size from toc: %lld\n", toc_stream_size);
+      lprintf("stream size from toc: %"PRId64"\n", toc_stream_size);
     }
 
     return vbri;
@@ -460,7 +460,7 @@ static int parse_frame_payload(demux_mpgaudio_t *this,
   uint64_t       pts = 0;
 
   frame_pos = this->input->get_current_pos(this->input) - 4;
-  lprintf("frame_pos = %lld\n", frame_pos);
+  lprintf("frame_pos = %"PRId64"\n", frame_pos);
 
   buf = this->audio_fifo->buffer_pool_alloc(this->audio_fifo);
 
@@ -510,7 +510,7 @@ static int parse_frame_payload(demux_mpgaudio_t *this,
   buf->decoder_flags          = decoder_flags|BUF_FLAG_FRAME_END;
 
   this->audio_fifo->put(this->audio_fifo, buf);
-  lprintf("send buffer: pts=%lld\n", pts);  
+  lprintf("send buffer: pts=%"PRId64"\n", pts);  
   this->cur_time += this->cur_frame.duration;
   return 1;
 }
@@ -823,9 +823,9 @@ static void demux_mpgaudio_send_headers (demux_plugin_t *this_gen) {
 
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->br);
     _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->br);
-    lprintf("frame_start: %lld, frame_end: %lld\n",
+    lprintf("frame_start: %"PRId64", frame_end: %"PRId64"\n",
             this->mpg_frame_start, this->mpg_frame_end);
-    lprintf("stream size: %lld, mp3 size: %lld\n",
+    lprintf("stream size: %"PRId64", mp3 size: %"PRId64"\n",
             this->input->get_length(this->input),
             this->mpg_size);
     lprintf("stream_length: %d ms\n", this->stream_length);
@@ -939,7 +939,7 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen,
     /* Convert position seek to time seek */
     if (!start_time) {
       start_time = (int)((double)start_pos * (double)this->stream_length / 65535.0f);
-      lprintf("position seek: start_pos=%lld => start_time=%d\n", start_pos, start_time);
+      lprintf("position seek: start_pos=%"PRId64" => start_time=%d\n", start_pos, start_time);
     }
 
     if (start_time < 0)
@@ -951,14 +951,14 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen,
       if (this->xing_header &&
           (this->xing_header->flags & (XING_TOC_FLAG | XING_BYTES_FLAG))) {
         seek_pos += xing_get_seek_point(this->xing_header, start_time, this->stream_length);
-        lprintf("time seek: xing: time=%d, pos=%lld\n", start_time, seek_pos);
+        lprintf("time seek: xing: time=%d, pos=%"PRId64"\n", start_time, seek_pos);
       } else if (this->vbri_header) {
         seek_pos += vbri_get_seek_point(this->vbri_header, start_time, this->stream_length);
-        lprintf("time seek: vbri: time=%d, pos=%lld\n", start_time, seek_pos);
+        lprintf("time seek: vbri: time=%d, pos=%"PRId64"\n", start_time, seek_pos);
       } else {
         /* cbr */
         seek_pos += ((double)start_time / 1000.0) * ((double)this->br / 8.0);
-        lprintf("time seek: cbr: time=%d, pos=%lld\n", start_time, seek_pos);
+        lprintf("time seek: cbr: time=%d, pos=%"PRId64"\n", start_time, seek_pos);
       }
     }
     /* assume seeking is always perfect... */
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 59ede919b..f35ce7935 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_ogg.c,v 1.175 2007/02/08 02:40:22 dsalt Exp $
+ * $Id: demux_ogg.c,v 1.176 2007/02/20 00:34:56 dgp85 Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -718,7 +718,7 @@ static void send_ogg_buf (demux_ogg_t *this,
 
     buf->size = 12 + op->bytes + 1;
 
-    lprintf ("CMML stream %d (bytes=%ld): PTS %lld: %s\n",
+    lprintf ("CMML stream %d (bytes=%ld): PTS %"PRId64": %s\n",
              stream_num, op->bytes, buf->pts, str);
 
     this->video_fifo->put (this->video_fifo, buf);
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index f15eb8840..11b0dbf38 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -31,7 +31,7 @@
  *   
  *   Based on FFmpeg's libav/rm.c.
  *
- * $Id: demux_real.c,v 1.112 2007/01/19 00:26:40 dgp85 Exp $
+ * $Id: demux_real.c,v 1.113 2007/02/20 00:34:56 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -181,7 +181,7 @@ static void real_parse_index(demux_real_t *this) {
   real_index_entry_t **index;
   
   while(next_index_chunk) {
-    lprintf("reading index chunk at %llX\n", next_index_chunk);
+    lprintf("reading index chunk at %"PRIX64"\n", next_index_chunk);
 
     /* Seek to index chunk */
     this->input->seek(this->input, next_index_chunk, SEEK_SET);
@@ -401,9 +401,9 @@ static void real_parse_headers (demux_real_t *this) {
 	this->avg_bitrate   = BE_32(&chunk_buffer[6]);
 
         lprintf("PROP: duration: %d ms\n", this->duration);
-        lprintf("PROP: index start: %llX\n", this->index_start);
-        lprintf("PROP: data start: %llX\n", this->data_start);
-        lprintf("PROP: average bit rate: %lld\n", this->avg_bitrate);
+        lprintf("PROP: index start: %"PRIX64"\n", this->index_start);
+        lprintf("PROP: data start: %"PRIX64"\n", this->data_start);
+        lprintf("PROP: average bit rate: %"PRId64"\n", this->avg_bitrate);
 
 	if (this->avg_bitrate<1)
 	  this->avg_bitrate = 1;
@@ -854,12 +854,12 @@ static void check_newpts (demux_real_t *this, int64_t pts, int video, int previe
   int64_t diff;
 
   diff = pts - this->last_pts[video];
-  lprintf ("check_newpts %lld\n", pts);
+  lprintf ("check_newpts %"PRId64"\n", pts);
 
   if (!preview && pts &&
       (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) {
 
-    lprintf ("diff=%lld\n", diff);
+    lprintf ("diff=%"PRId64"\n", diff);
 
     if (this->buf_flag_seek) {
       _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -1012,7 +1012,7 @@ static int demux_real_send_chunk(demux_plugin_t *this_gen) {
     size--;
   }
 
-  lprintf ("packet of stream %d, 0x%X bytes @ %llX, pts = %lld%s\n",
+  lprintf ("packet of stream %d, 0x%X bytes @ %"PRIX64", pts = %"PRId64"%s\n",
            stream, size, offset, pts, keyframe ? ", keyframe" : "");
 
   if (this->video_stream && (stream == this->video_stream->mdpr->stream_number)) {