Fork : Fix Merging (4084) Part2.
Update 4 Dutch DVB-C (Ziggo) tuning parameters (TNX Lbr_Lion!)
Based on 'BUG-3947-TSWriter-Deadlock-v2' branch, with async logging mods from 'EXP-TsWriter_async_logging', packetSync mods from 'MP1-EXP_TsReader_PacketSync', 'otherMux (0x46)' channel scanning mods from 'MP1-EXP_tvserver_0x46_scan_fixes' and minor Unicode logging fix manually merged into the code. Version resources also added.
Version info updated correctly....
Small logging changes to ensure log thread cannot be re-started after filter destructor is called.
"PCR_hunt_v3" patch applied (from http://forum.team-mediaportal.com/threads/dvb-c-radio-not-working.118141/page-5#post-986197 )
Merge remote-tracking branch 'remotes/upstream/MP1-EXP_TsWriter_MP15x_Owlsroost' into 1.5.0Fork
MP1-4215 [PATCH 1/3] used "using" for streamreaders and streamwriters to save resources
MP1-4215 [PATCH 2/3] Added JSON parser to WebEPG
MP1-4215 [PATCH 3/3] Improved logging
Merge remote-tracking branch 'remotes/upstream/MP1-4215-FEAT-Add_JSON_parser_for_grabbers_WEBEPG' into 1.5.0Fork