#7 Merge-fix: don't buffer subtitle inactive streams too