~mamarley/tvheadend/+git/trunk:feature/picons

Last commit made on 2014-06-11
Get this branch:
git clone -b feature/picons https://git.launchpad.net/~mamarley/tvheadend/+git/trunk

Branch merges

Branch information

Name:
feature/picons
Repository:
lp:~mamarley/tvheadend/+git/trunk

Recent commits

ac24fe6... by Adam Sutton

channel: added support for getting icons from underlying services

Also added an initial implementation of picon support.

e2b91b3... by Adam Sutton

mpegts network_scan: fix problem with active muxes being re-added to scan Q

626d2f0... by Jaroslav Kysela <email address hidden>

tvhcsa_descramble: remove unused elementary_stream parameter

0e29d5a... by Jaroslav Kysela <email address hidden>

httpc: use poll to check for the EINPROGRESS state

87a232e... by Adam Sutton

mpegts network_scan: fix problems with having multiple networks

previously as soon as any mux failed it would give up assuming nothing else
could be tuned. However just because no tuner was available that could service
that mux doesn't mean there wasn't one that couldn't service another.

The only real issue I can see with this is if we're idle scanning it's possible
due to bad luck to starve muxes of an attempt. We can either rely on random
chance or put some additional weighting based on time? Though that could be
problematic for other reasons.

b22336f... by Jaroslav Kysela <email address hidden>

httpc: add checking for NULL scheme and host

3b808e7... by Jaroslav Kysela <email address hidden>

capmt: another 'mode 1' fix

985f3af... by Jaroslav Kysela <email address hidden>

capmt: adapter index fix for 'mode 1'

6fc3a46... by Jaroslav Kysela <email address hidden>

Makefile: Simplify (and probably fix) the ffdecsa rules

4b4eb4d... by perexg <email address hidden>

Merge pull request #422 from dmarion/osx

2 fixes to make it build-able on OS X