[MPlayer-cvslog] r34227 - in trunk: libmpcodecs/ve_vfw.c libmpdemux/demux_nsv.c libmpdemux/muxer_avi.c stream/stream.h stream/stream_vstream.c sub/vobsub.c

[diego]

Author: diego
Date: Thu Oct 20 23:49:30 2011
New Revision: 34227

Log:
Fix off_t printf conversion specifiers and related warnings.

Modified:
   trunk/libmpcodecs/ve_vfw.c
   trunk/libmpdemux/demux_nsv.c
   trunk/libmpdemux/muxer_avi.c
   trunk/stream/stream.h
   trunk/stream/stream_vstream.c
   trunk/sub/vobsub.c

Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c	Thu Oct 20 18:42:31 2011	(r34226)
+++ trunk/libmpcodecs/ve_vfw.c	Thu Oct 20 23:49:30 2011	(r34227)
@@ -147,7 +147,7 @@ mp_msg(MSGT_WIN32,MSGL_INFO,"\n");
         return NULL;
       }
       fclose(fd);
-      mp_msg(MSGT_WIN32,MSGL_ERR,"Compressor data %d bytes\n", st.st_size);
+      mp_msg(MSGT_WIN32,MSGL_ERR,"Compressor data %"PRIu64"d bytes\n", st.st_size);
       if (!(temp_len = (unsigned int) ICSendMessage(encoder_hic, ICM_SETSTATE, (LPARAM) drvdata, (int) st.st_size))){
         mp_msg(MSGT_WIN32,MSGL_ERR,"ICSetState failed!\n");
         free(drvdata);

Modified: trunk/libmpdemux/demux_nsv.c
==============================================================================
--- trunk/libmpdemux/demux_nsv.c	Thu Oct 20 18:42:31 2011	(r34226)
+++ trunk/libmpdemux/demux_nsv.c	Thu Oct 20 23:49:30 2011	(r34227)
@@ -23,6 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -75,7 +76,8 @@ static int demux_nsv_fill_buffer ( demux
     // sometimes instead of 0xBEEF as described for the next audio/video chunk we get
     // a whole new header
 
-    mp_dbg(MSGT_DEMUX,MSGL_DBG2,"demux_nsv: %08X %08X\n",hdr[0]<<8|hdr[1],stream_tell(demuxer->stream));
+    mp_dbg(MSGT_DEMUX, MSGL_DBG2, "demux_nsv: %08X %08"PRIu64"X\n",
+           hdr[0] << 8 | hdr[1], stream_tell(demuxer->stream));
     switch(hdr[0]<<8|hdr[1]) {
         case 0x4E53:
             if(hdr[2]==0x56 && hdr[3]==0x73){

Modified: trunk/libmpdemux/muxer_avi.c
==============================================================================
--- trunk/libmpdemux/muxer_avi.c	Thu Oct 20 18:42:31 2011	(r34226)
+++ trunk/libmpdemux/muxer_avi.c	Thu Oct 20 23:49:30 2011	(r34227)
@@ -486,7 +486,9 @@ info[i].id=0;
   } else {
     if (stream_tell(muxer->stream) != MOVIALIGN) {
 	mp_msg(MSGT_MUXER, MSGL_ERR, "Opendml superindex is too big for reserved space!\n");
-	mp_msg(MSGT_MUXER, MSGL_ERR, "Expected filepos %d, real filepos %ld, missing space %ld\n", MOVIALIGN, stream_tell(muxer->stream), stream_tell(muxer->stream)-MOVIALIGN);
+        mp_msg(MSGT_MUXER, MSGL_ERR,
+               "Expected filepos %d, real filepos %"PRIu64"d, missing space %"PRIu64"d\n",
+               MOVIALIGN, stream_tell(muxer->stream), stream_tell(muxer->stream) - MOVIALIGN);
 	mp_msg(MSGT_MUXER, MSGL_ERR, "Try increasing MOVIALIGN in libmpdemux/muxer_avi.c\n");
     }
     write_avi_list(muxer->stream,listtypeAVIMOVIE,muxer->movi_end-stream_tell(muxer->stream)-12);

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Thu Oct 20 18:42:31 2011	(r34226)
+++ trunk/stream/stream.h	Thu Oct 20 23:49:30 2011	(r34227)
@@ -294,11 +294,11 @@ inline static off_t stream_tell(stream_t
 
 inline static int stream_seek(stream_t *s,off_t pos){
 
-  mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%llX\n", (long long)pos);
+  mp_dbg(MSGT_DEMUX, MSGL_DBG3, "seek to 0x%"PRIu64"X\n", pos);
 
   if (pos < 0) {
-    mp_msg(MSGT_DEMUX, MSGL_ERR, "Invalid seek to negative position %llx!\n",
-           (long long)pos);
+    mp_msg(MSGT_DEMUX, MSGL_ERR,
+           "Invalid seek to negative position %"PRIu64"x!\n", pos);
     pos = 0;
   }
   if(pos<s->pos){

Modified: trunk/stream/stream_vstream.c
==============================================================================
--- trunk/stream/stream_vstream.c	Thu Oct 20 18:42:31 2011	(r34226)
+++ trunk/stream/stream_vstream.c	Thu Oct 20 23:49:30 2011	(r34227)
@@ -153,7 +153,7 @@ static int open_s(stream_t *stream, int 
 
   stream->start_pos = 0;
   stream->end_pos = vstream_streamsize();
-  mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %d\n", stream->end_pos);
+  mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %"PRIu64"d\n", stream->end_pos);
 
   stream->priv = p;
   stream->fill_buffer = fill_buffer;

Modified: trunk/sub/vobsub.c
==============================================================================
--- trunk/sub/vobsub.c	Thu Oct 20 18:42:31 2011	(r34226)
+++ trunk/sub/vobsub.c	Thu Oct 20 23:49:30 2011	(r34227)
@@ -21,6 +21,7 @@
 
 #include <ctype.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -695,7 +696,7 @@ static int vobsub_parse_timestamp(vobsub
 {
     int h, m, s, ms;
     off_t filepos;
-    if (sscanf(line, " %02d:%02d:%02d:%03d, filepos: %09lx",
+    if (sscanf(line, " %02d:%02d:%02d:%03d, filepos: %09"PRIu64"x",
                &h, &m, &s, &ms, &filepos) != 5)
         return -1;
     return vobsub_add_timestamp(vob, filepos, vob->delay + ms + 1000 * (s + 60 * (m + 60 * h)));