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

demux: fix a corner case related to demux_disc 

It can happen that demux_fill_buffer() adds more than 1 packet, and then
the packets would add up. Affects demux_disc.c only (nothing else uses
this function).
This commit is contained in:
wm4 2014-07-06 19:02:58 +02:00
parent e3a3b764c8
commit f3604fc3fb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demux/demux.c
View File

@ -327,11 +327,14 @@ bool demux_stream_eof(struct sh_stream *sh)
// Read and return any packet we find.
struct demux_packet *demux_read_any_packet(struct demuxer *demuxer)
{
demux_fill_buffer(demuxer);
for (int n = 0; n < demuxer->num_streams; n++) {
struct sh_stream *sh = demuxer->streams[n];
if (sh->ds->head)
return demux_read_packet(sh);
for (int retry = 0; retry < 2; retry++) {
for (int n = 0; n < demuxer->num_streams; n++) {
struct sh_stream *sh = demuxer->streams[n];
if (sh->ds->head)
return demux_read_packet(sh);
}
// retry after calling this
demux_fill_buffer(demuxer);
}
return NULL;
}