Ensure PCR PID is passed to the passthrough muxer when it is not the same as a content PID
Merge remote-tracking branch 'tvh/master' into scr