Fixing the remap function (PID increment and PES Private Data handling)