← Back to branch summary

~ubuntu-branches/ubuntu/wily/mpv/wily

« back to all changes in this revision

Viewing changes to demux/demux.c

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2015-02-08 11:38:05 UTC
  • mfrom: (28.1.4 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150208113805-hb7kk68170y002es
Tags: 0.7.3-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/rules:
    + Disable altivec on ppc64el again, as it FTBFS with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
demux/demux.c
554
554
        if (ds->in->threading) {
555
555
            pthread_mutex_lock(&ds->in->lock);
556
556
            *out_pkt = dequeue_packet(ds);
557
 
            r = *out_pkt ? 1 : (ds->eof ? -1 : 0);
 
557
            r = *out_pkt ? 1 : ((ds->eof || !ds->selected) ? -1 : 0);
558
558
            ds->active = ds->selected; // enable readahead
559
559
            ds->in->eof = false; // force retry
560
560
            pthread_cond_signal(&ds->in->wakeup); // possibly read more