[mythtv-cmyth] Demuxer: Refactor, cosmetics
Merge pull request #6 from janbar/temp

[mythtv-cmyth] Demuxer: Refactor, cosmetics