diff options
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/demux/demux.c b/demux/demux.c index 92f2eaacc4..bd62e6f0ef 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -2258,17 +2258,6 @@ static int dequeue_packet(struct demux_stream *ds, struct demux_packet **res) if (in->blocked) return 0; - if (ds->eager) { - in->reading = true; // enable readahead - in->eof = false; // force retry - pthread_cond_signal(&in->wakeup); // possibly read more - } - - if (ds->back_resuming || ds->back_restarting) { - assert(in->back_demuxing); - return 0; - } - if (ds->sh->attached_picture) { ds->eof = true; if (ds->attached_picture_added) @@ -2282,6 +2271,17 @@ static int dequeue_packet(struct demux_stream *ds, struct demux_packet **res) return 1; } + if (ds->eager) { + in->reading = true; // enable readahead + in->eof = false; // force retry + pthread_cond_signal(&in->wakeup); // possibly read more + } + + if (ds->back_resuming || ds->back_restarting) { + assert(in->back_demuxing); + return 0; + } + bool eof = !ds->reader_head && ds->eof; if (in->back_demuxing) { |