vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Sep 29 12:59:43 2016 +0200| [19e09d6cef8916fbcaa968b12266d9ed86cf2543] | committer: Francois Cartegnie
demux: adaptive: fix end of stream regression (#fix 8936) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19e09d6cef8916fbcaa968b12266d9ed86cf2543 --- modules/demux/adaptive/Streams.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp index 70de37a..01f97d4 100644 --- a/modules/demux/adaptive/Streams.cpp +++ b/modules/demux/adaptive/Streams.cpp @@ -385,9 +385,6 @@ AbstractStream::status AbstractStream::dequeue(mtime_t nz_deadline, mtime_t *pi_ *pi_pcr = nz_deadline; - if (isDisabled()) - return AbstractStream::status_eof; - if(commandsqueue->isFlushing()) { *pi_pcr = commandsqueue->Process(p_realdemux->out, VLC_TS_0 + nz_deadline); @@ -401,7 +398,7 @@ AbstractStream::status AbstractStream::dequeue(mtime_t nz_deadline, mtime_t *pi_ } } - if(commandsqueue->isEOF()) + if(isDisabled() || commandsqueue->isEOF()) { *pi_pcr = nz_deadline; return AbstractStream::status_eof; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
