mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Reuse ds_get_packet in ds_get_packet_pts

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29546 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-08-23 15:32:42 +00:00
parent 62123551eb
commit 9e5e535e34
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libmpdemux/demuxer.c
View File

@ -646,19 +646,12 @@ int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts)
{
int len;
*pts = MP_NOPTS_VALUE;
if (ds->buffer_pos >= ds->buffer_size) {
if (!ds_fill_buffer(ds)) {
// EOF
*start = NULL;
return -1;
}
}
len = ds_get_packet(ds, start);
if (len < 0)
return len;
// Return pts unless this read starts from the middle of a packet
if (!ds->buffer_pos)
if (len == ds->buffer_pos)
*pts = ds->current->pts;
len = ds->buffer_size - ds->buffer_pos;
*start = &ds->buffer[ds->buffer_pos];
ds->buffer_pos += len;
return len;
}