Mercurial > mplayer.hg
comparison libmpdemux/demux_viv.c @ 7472:c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
author | arpi |
---|---|
date | Sun, 22 Sep 2002 02:33:28 +0000 |
parents | 3898967fcc96 |
children | 772d6d27fd66 |
comparison
equal
deleted
inserted
replaced
7471:5e56ce70b551 | 7472:c4434bdf6e51 |
---|---|
220 if (param) | 220 if (param) |
221 free(param); | 221 free(param); |
222 } | 222 } |
223 | 223 |
224 int vivo_check_file(demuxer_t* demuxer){ | 224 int vivo_check_file(demuxer_t* demuxer){ |
225 int flags=0; | |
226 int i=0; | 225 int i=0; |
227 int len; | 226 int len; |
228 int len2; | |
229 int c; | 227 int c; |
230 unsigned char buf[2048+256]; | 228 unsigned char buf[2048+256]; |
231 vivo_priv_t* priv; | 229 vivo_priv_t* priv; |
232 int orig_pos = stream_tell(demuxer->stream); | 230 int orig_pos = stream_tell(demuxer->stream); |
233 | 231 |
308 { | 306 { |
309 /* ok, this works, but pts calculating from header is required! */ | 307 /* ok, this works, but pts calculating from header is required! */ |
310 #warning "Calculate PTS from picture header!" | 308 #warning "Calculate PTS from picture header!" |
311 prefix = 1; | 309 prefix = 1; |
312 c = stream_read_char(demux->stream); | 310 c = stream_read_char(demux->stream); |
313 printf("packet 0x82(pos=%lu) chunk=%x\n", | 311 printf("packet 0x82(pos=%u) chunk=%x\n", |
314 stream_tell(demux->stream), c); | 312 (int)stream_tell(demux->stream), c); |
315 } | 313 } |
316 switch(c&0xF0){ | 314 switch(c&0xF0){ |
317 case 0x00: // header - skip it! | 315 case 0x00: // header - skip it! |
318 { | 316 { |
319 len=stream_read_char(demux->stream); | 317 len=stream_read_char(demux->stream); |
616 demuxer->video->id=0; | 614 demuxer->video->id=0; |
617 | 615 |
618 /* disable seeking */ | 616 /* disable seeking */ |
619 demuxer->seekable = 0; | 617 demuxer->seekable = 0; |
620 | 618 |
621 printf("VIVO Video stream %d size: display: %dx%d, codec: %lux%lu\n", | 619 printf("VIVO Video stream %d size: display: %dx%d, codec: %ux%u\n", |
622 demuxer->video->id, sh->disp_w, sh->disp_h, sh->bih->biWidth, | 620 demuxer->video->id, sh->disp_w, sh->disp_h, sh->bih->biWidth, |
623 sh->bih->biHeight); | 621 sh->bih->biHeight); |
624 } | 622 } |
625 | 623 |
626 /* AUDIO init */ | 624 /* AUDIO init */ |