Merged duplicate

This commit is contained in:
Frank Schmirler 2014-09-02 08:54:28 +02:00
parent e8629b5ec6
commit 71c26e7455

View File

@ -119,9 +119,10 @@ Jori Hamalainen
for extensive testing while making stream compatible to Network Media Tank
for adding Network Media Tank browser support to HTML pages
owagner
Oliver Wagner
for pointing out a problem with the encrypted channel switching fix
for suggesting use of SO_KEEPALIVE socket option to detect dead sockets
for making cStatus::ChannelChange re-tune only if CA IDs changed
Joachim König-Baltes
for fixing Min/MaxPriority parsing
@ -225,6 +226,3 @@ hivdr
hummel99
for reporting and helping to debug channel switch issues with priority > 0
for reporting a race condition when switching the server's LiveTV device
Oliver Wagner
for making cStatus::ChannelChange re-tune only if CA IDs changed