[MPlayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.72,1.73

Nico Sabbi CVS syncmail at mplayerhq.hu
Fri May 13 01:12:29 CEST 2005


CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv1983

Modified Files:
	demux_ogg.c 
Log Message:
fixed too few parameters to mp_msg(); silence compilation warnings, removed unused variable

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- demux_ogg.c	12 May 2005 23:01:52 -0000	1.72
+++ demux_ogg.c	12 May 2005 23:12:27 -0000	1.73
@@ -754,14 +754,14 @@
 
 static void fixup_vorbis_wf(sh_audio_t *sh)
 {
-  int i, k, offset;
+  int i, offset;
   ogg_packet op[3];
   unsigned char *buf[3];
   unsigned char *ptr;
 
   for(i = 0; i < 3; i++) {
     op[i].bytes = ds_get_packet(sh->ds, &(op[i].packet));
-    mp_msg(MSGT_DEMUX,MSGL_V, "fixup_vorbis_wf: i=%d, size=%d\n", i, op[i].bytes);
+    mp_msg(MSGT_DEMUX,MSGL_V, "fixup_vorbis_wf: i=%d, size=%ld\n", i, op[i].bytes);
     if(op[i].bytes < 0) {
        mp_msg(MSGT_DEMUX,MSGL_ERR,"Ogg demuxer error!, fixup_vorbis_wf: bad packet n. %d\n", i);
        return;
@@ -778,11 +778,11 @@
   ptr[0] = 2;
   offset = 1;
   offset += store_ughvlc(&ptr[offset], op[0].bytes);
-  mp_msg(MSGT_DEMUX,MSGL_V,"demux_ogg, offset after 1st len = %d\n", offset);
+  mp_msg(MSGT_DEMUX,MSGL_V,"demux_ogg, offset after 1st len = %u\n", offset);
   offset += store_ughvlc(&ptr[offset], op[1].bytes);
-  mp_msg(MSGT_DEMUX,MSGL_V,"demux_ogg, offset after 2nd len = %d\n", offset);
+  mp_msg(MSGT_DEMUX,MSGL_V,"demux_ogg, offset after 2nd len = %u\n", offset);
   for(i = 0; i < 3; i++) {
-    mp_msg(MSGT_DEMUX,MSGL_V,"demux_ogg, i=%d\n", op[i].bytes, offset, i);
+    mp_msg(MSGT_DEMUX,MSGL_V,"demux_ogg, i=%d, bytes: %ld, offset: %u\n", i, op[i].bytes, offset);
     memcpy(&ptr[offset], buf[i], op[i].bytes);
     offset += op[i].bytes;
   }




More information about the MPlayer-cvslog mailing list