# HG changeset patch
# User mosu
# Date 1070877070 0
# Node ID 2c9e2da67647a3b357883c2cea995934192ca0ea
# Parent  0ac7fe8f3af8d5ac54c4027af6c672fa43d63595
Fixes for a couple of warnings.

diff -r 0ac7fe8f3af8 -r 2c9e2da67647 libmpdemux/demux_ogg.c
--- a/libmpdemux/demux_ogg.c	Mon Dec 08 09:47:15 2003 +0000
+++ b/libmpdemux/demux_ogg.c	Mon Dec 08 09:51:10 2003 +0000
@@ -531,7 +531,7 @@
   if(index_mode == 2) mp_msg(MSGT_DEMUX,MSGL_INFO,"\n");
 
   if(index_mode == 2) mp_msg(MSGT_DEMUX,MSGL_V,"Ogg syncpoints table builed: %d syncpoints\n",ogg_d->num_syncpoint);
-  mp_msg(MSGT_DEMUX,MSGL_V,"Ogg stream length: %d\n",ogg_d->final_granulepos);
+  mp_msg(MSGT_DEMUX,MSGL_V,"Ogg stream length (granulepos): %lld\n",ogg_d->final_granulepos);
 
   stream_reset(s);
   stream_seek(s,demuxer->movi_start);
diff -r 0ac7fe8f3af8 -r 2c9e2da67647 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Mon Dec 08 09:47:15 2003 +0000
+++ b/libmpdemux/demuxer.c	Mon Dec 08 09:51:10 2003 +0000
@@ -602,6 +602,9 @@
 extern int demux_open_mkv(demuxer_t *demuxer);
 extern int ra_check_file(demuxer_t *demuxer);
 extern int demux_open_ra(demuxer_t* demuxer);
+#ifdef HAVE_MATROSKA
+extern int demux_mkv_open(demuxer_t *demuxer);
+#endif
 
 extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer);
 
@@ -1183,7 +1186,7 @@
     } else {
       sh_video=d_video->sh;sh_video->ds=d_video;
       sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms
-      mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO:  [%.4s]  %ldx%ld  %dbpp\n",
+      mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO:  [%.4s]  %dx%d  %dbpp\n",
         (char *)&sh_video->bih->biCompression,
         sh_video->bih->biWidth,
         sh_video->bih->biHeight,