~mamarley/tvheadend/+git/trunk:htsp/19

Last commit made on 2015-01-07
Get this branch:
git clone -b htsp/19 https://git.launchpad.net/~mamarley/tvheadend/+git/trunk

Branch merges

Branch information

Name:
htsp/19
Repository:
lp:~mamarley/tvheadend/+git/trunk

Recent commits

c51b162... by Sam Stenvall

[dvr] add "directory" option to auto and time recorder entries to
override directory settings for matching recordings.

Useful for e.g. recording multiple different shows into a single
directory (e.g. news).

Fixes #2123, fixes #2448

09bd4c4... by Mariusz Bialonczyk <email address hidden>

help: add missing information about new OSCam mode

ba36e45... by Joakim Gissberg <email address hidden>

Upgrade to FFmpeg 2.5.2

0872d71... by Jaroslav Kysela <email address hidden>

dvb_psi: fix the service re-enable procedure

900b20e... by Jaroslav Kysela <email address hidden>

SAT>IP: Trace RTP discontinuity

1afee16... by Jaroslav Kysela <email address hidden>

service check: text cleanups, add help text, re-enable service when they're broadcasted again, fixes #2595

1027f29... by Jaroslav Kysela <email address hidden>

transcode: fix AAC encoding (wrong ADTS header - typo in source)

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

passthrough muxer: fix pmt packet overflow, fixes #2593

b85ec59... by Mariusz Bialonczyk <email address hidden>

capmt: add support for OSCam network protocol v1

93e533f... by Piotr Kuchciak <email address hidden>

Help: clear cosmetic