FreeBSD 1/X - Fix compiler errors
Merge remote-tracking branch 'upstream/master' into freebsd

* upstream/master:
  webui: enable file logging when the log file is set through GUI
  webui: remove dead code (tvhlog_level)
  webui: Stream directly for TVHeadend/ http client, too
  epggrab: ota - improve save caching and add no data timeout
  epggrab: ota - optimize the eit/opentv workflow
  epggrab: ota - requeue skipped muxes (network check)
  SAT>IP: finish the RTSP OPTIONS command to keep connection consistent
  SAT>IP: finish the RTSP command to keep connection consistent
  capmt: a slight optimization - remove the key data
  service_mapper: remove include "plumbing/tsfix.h"
  descrambler: add other odd/even key validity check based on the key update time
  capmt: do not cache keys for the descrambler layer
cwc: change the multiple CA PID handling
cwc/mpegts dvb service: prevent auto-changes for prefcaid (see issue #2075)
service: fix some compiler warnings
mpegts dvb service: add CA PID filter (lock) mode 2 to force CA PID

- works for both cwc and capmt
cwc: little log fix (auto-reconnect)...
mpegts service: Add documentation for Lock Pref. CA PID
FreeBSD 2/X Fix path for dtv-scan-tables
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
esfilter: add logical stream index, enhance the CA type filtering

- add the logical stream index - see help
- add the PID filtering for the CA type
- fix the service info dialog (do not show some filtered CAIDs)
service: show also network name in the service nicename
service: esfilter - set use flag when no filters are applied
service: esfilter - set CA use flag also for skipped types
service: add PMT# for noname services and include full service name in service lists
Merge remote-tracking branch 'upstream/master' into freebsd

* upstream/master:
  service: add PMT# for noname services and include full service name in service lists
  service: esfilter - set CA use flag also for skipped types
  service: esfilter - set use flag when no filters are applied
  service: show also network name in the service nicename
  esfilter: add logical stream index, enhance the CA type filtering
Put back project headers. From before to after the global includes.
Merge pull request #438 from dreamcat4/freebsd

Fix FreeBSD compiler errors.
Remove PRIsize_t, PRIssize_t and PRIoff_t

The reason is that size_t and ssize_t are covered by %zu and %zd
format specifiers. The offset can be printed using %jd format
with the (intmax_t) type conversion.
linuxdvb: fix en50494 (unicable) config loading