diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-08 09:51:10 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-08 09:51:10 +0000 |
| commit | 36aee719501203fda3b6664a8f1273077a7db53a (patch) | |
| tree | 22a37fdfcb06aa27a8a5afdbe4977a9eec3c74b7 /libmpdemux/demuxer.c | |
| parent | a1f615e34d6b84bbfcd504fa76d45a554485f5a1 (diff) | |
| download | mpv-36aee719501203fda3b6664a8f1273077a7db53a.tar.bz2 mpv-36aee719501203fda3b6664a8f1273077a7db53a.tar.xz | |
Fixes for a couple of warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11577 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 1967126e7b..3e27d0e7c3 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -602,6 +602,9 @@ extern int demux_open_ts(demuxer_t *demuxer); 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 @@ switch(file_format){ } 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, |