Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 11576:2c9e2da67647
Fixes for a couple of warnings.
| author | mosu |
|---|---|
| date | Mon, 08 Dec 2003 09:51:10 +0000 |
| parents | 0ac7fe8f3af8 |
| children | 0908285ada31 |
comparison
equal
deleted
inserted
replaced
| 11575:0ac7fe8f3af8 | 11576:2c9e2da67647 |
|---|---|
| 600 extern int ts_check_file(demuxer_t * demuxer); | 600 extern int ts_check_file(demuxer_t * demuxer); |
| 601 extern int demux_open_ts(demuxer_t *demuxer); | 601 extern int demux_open_ts(demuxer_t *demuxer); |
| 602 extern int demux_open_mkv(demuxer_t *demuxer); | 602 extern int demux_open_mkv(demuxer_t *demuxer); |
| 603 extern int ra_check_file(demuxer_t *demuxer); | 603 extern int ra_check_file(demuxer_t *demuxer); |
| 604 extern int demux_open_ra(demuxer_t* demuxer); | 604 extern int demux_open_ra(demuxer_t* demuxer); |
| 605 #ifdef HAVE_MATROSKA | |
| 606 extern int demux_mkv_open(demuxer_t *demuxer); | |
| 607 #endif | |
| 605 | 608 |
| 606 extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); | 609 extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); |
| 607 | 610 |
| 608 int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats) | 611 int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats) |
| 609 | 612 |
| 1181 sh_video=NULL; | 1184 sh_video=NULL; |
| 1182 //printf("ASF: missing video stream!? contact the author, it may be a bug :(\n"); | 1185 //printf("ASF: missing video stream!? contact the author, it may be a bug :(\n"); |
| 1183 } else { | 1186 } else { |
| 1184 sh_video=d_video->sh;sh_video->ds=d_video; | 1187 sh_video=d_video->sh;sh_video->ds=d_video; |
| 1185 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms | 1188 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms |
| 1186 mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp\n", | 1189 mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO: [%.4s] %dx%d %dbpp\n", |
| 1187 (char *)&sh_video->bih->biCompression, | 1190 (char *)&sh_video->bih->biCompression, |
| 1188 sh_video->bih->biWidth, | 1191 sh_video->bih->biWidth, |
| 1189 sh_video->bih->biHeight, | 1192 sh_video->bih->biHeight, |
| 1190 sh_video->bih->biBitCount); | 1193 sh_video->bih->biBitCount); |
| 1191 // sh_video->i_bps=10*asf_packetsize; // FIXME! | 1194 // sh_video->i_bps=10*asf_packetsize; // FIXME! |