I need to test more, but it will have to be tomorrow.

While patch one seems OK now, the issue I mentioned about patch 2 being under
rate with gop 300 vs gop 30 still persists at high bitrates.

I initially thought it was only a bit low, and it is with the right test, but
it seems that it's possible to be a lot low sometimes. This is with really high
rates, like 100mbit. I need to see if there are combinations of
gop/framerate/bitrate that fail at normal rates.