RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25988 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-02-12 10:48:42 +00:00
parent f785eba8a1
commit df6f7b80c6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmpdemux/demuxer.c
View File

@ -425,7 +425,7 @@ int ds_fill_buffer(demux_stream_t *ds){
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 @@ int ds_get_packet_pts(demux_stream_t *ds,unsigned char **start, double *pts)
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];

4
libmpdemux/demuxer.h
View File

@ -228,9 +228,7 @@ static inline demux_packet_t* new_demux_packet(int len){
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;