Refactor multi-frame encoding to be non-recursive
3 files changed