Fix VBV
Fix VBV with true VFR streams
Merge commit '204a9bd0a1bc507cbd69a77f3318afcb56ede65d' into 7mod