Backed out changeset: 25dde1ffab66

This commit needs more investigation, with specific VBV
use cases like 1-sec GOPs.
simplify intra filter (with fix for da61cf406f16)