Mercurial > mplayer.hg
changeset 25956:7e4a2ab8b61c
Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.
I did not see anything obvious that would break, it if it does it should be
fixed properly once and for all.
| author | reimar |
|---|---|
| date | Tue, 12 Feb 2008 10:48:42 +0000 |
| parents | eff9e1b25743 |
| children | 0a3b2b2cc1c3 |
| files | libmpdemux/demuxer.c libmpdemux/demuxer.h |
| diffstat | 2 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demuxer.c Mon Feb 11 22:03:34 2008 +0000 +++ b/libmpdemux/demuxer.c Tue Feb 12 10:48:42 2008 +0000 @@ -425,7 +425,7 @@ ds->pos=p->pos; ds->dpos+=p->len; // !!! ++ds->pack_no; - if (p->pts != (correct_pts ? MP_NOPTS_VALUE : 0)) { + if (p->pts != MP_NOPTS_VALUE) { ds->pts=p->pts; ds->pts_bytes=0; } @@ -580,9 +580,8 @@ return -1; } } - // Should use MP_NOPTS_VALUE for "unknown pts" in the packets too // Return pts unless this read starts from the middle of a packet - if (!ds->buffer_pos && (correct_pts || ds->current->pts)) + if (!ds->buffer_pos) *pts = ds->current->pts; len=ds->buffer_size-ds->buffer_pos; *start = &ds->buffer[ds->buffer_pos];
--- a/libmpdemux/demuxer.h Mon Feb 11 22:03:34 2008 +0000 +++ b/libmpdemux/demuxer.h Tue Feb 12 10:48:42 2008 +0000 @@ -228,9 +228,7 @@ demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t)); dp->len=len; dp->next=NULL; - // still using 0 by default in case there is some code that uses 0 for both - // unknown and a valid pts value - dp->pts=correct_pts ? MP_NOPTS_VALUE : 0; + dp->pts=MP_NOPTS_VALUE; dp->endpts=MP_NOPTS_VALUE; dp->stream_pts = MP_NOPTS_VALUE; dp->pos=0;