Mercurial > mplayer.hg
comparison libmpdemux/demuxer.c @ 16198:3e8e281ecc86
fix brokeness caused by demuxer patch, this code is useless for
any case other than avi and should not be run even then.
patch by Uoti Urpala (urpala BANG cc MEEP helsinki MEEP fi)
| author | ods15 |
|---|---|
| date | Thu, 11 Aug 2005 17:01:13 +0000 |
| parents | 6b86089c2edd |
| children | f443f849531b |
comparison
equal
deleted
inserted
replaced
| 16197:2201258c49fd | 16198:3e8e281ecc86 |
|---|---|
| 682 | 682 |
| 683 if (demuxer->desc->open) | 683 if (demuxer->desc->open) |
| 684 if (!(demuxer = demuxer->desc->open(demuxer))) | 684 if (!(demuxer = demuxer->desc->open(demuxer))) |
| 685 return NULL; | 685 return NULL; |
| 686 | 686 |
| 687 pts_from_bps=0; // !!! | |
| 688 if ((sh_video=demuxer->video->sh) && sh_video->bih) | 687 if ((sh_video=demuxer->video->sh) && sh_video->bih) |
| 689 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", | 688 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", |
| 690 (char *)&sh_video->bih->biCompression, | 689 (char *)&sh_video->bih->biCompression, |
| 691 sh_video->bih->biWidth, | 690 sh_video->bih->biWidth, |
| 692 sh_video->bih->biHeight, | 691 sh_video->bih->biHeight, |