]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1af984c 8ca95e9)
Merge remote-tracking branch 'upstream/master' into freebsd
authorDreamcat4 <dreamcat4@gmail.com>
Wed, 30 Jul 2014 19:15:33 +0000 (20:15 +0100)
committerDreamcat4 <dreamcat4@gmail.com>
Wed, 30 Jul 2014 19:15:33 +0000 (20:15 +0100)
* upstream/master:
  mpegts service: Add documentation for Lock Pref. CA PID
  cwc: little log fix (auto-reconnect)...
  mpegts dvb service: add CA PID filter (lock) mode 2 to force CA PID
  service: fix some compiler warnings
  cwc/mpegts dvb service: prevent auto-changes for prefcaid (see issue #2075)
  cwc: change the multiple CA PID handling


Trivial merge
Mirror of https://github.com/tvheadend/tvheadend.git