Fix for new SSL connection
Remove unused RTMP flag
Don't patch live streams
Resync with upstream
Merge remote-tracking branch 'upstream/master'
Kanal5Play: Use both RTMP and HLS to get more programs working
Remove Log call, fix non functional indentation
Small change in which URL to get the prefix path from
Derive HLS URL from RTMP URL to get more programs working for HLS only clients
Merge pull request #616 from meriko/master

Kanal5Play: Use both RTMP and HLS to get more programs working