From: Dreamcat4 Date: Wed, 30 Jul 2014 19:15:33 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' into freebsd X-Git-Tag: v4.1~1720^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c168cb3adc12e7a3f16a2b3cec3475a7fb69fe00;p=thirdparty%2Ftvheadend.git Merge remote-tracking branch 'upstream/master' into freebsd * 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 --- c168cb3adc12e7a3f16a2b3cec3475a7fb69fe00