* qatar/master:
  rpza: limit the number of blocks to the total remaining blocks in the frame

See: 3819db74Merged-by: Michael Niedermayer <michaelni@gmx.at>