No video or audio after PMT update

I have a TS channel which twice a day updates its PMT with a completely different set of ES. Seems they have two sets of ES with different content that they swap at given times. With v2.1.5 I got some discontinuties for some minutes but eventually it got back to normal, but with GIT head I get no video or audio output when transcoding said TS.

Reading the log, seems that VLC tries to switch the PCR to an ES id (640) which no longer exists on the updated PMT, but did exist on the previous PMT.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information