Merged as-at libav 398f015f, and therefore includes outstanding
skipped merges 04b17ff9 and 130e1f1d.

All features not in libav are preserved, and no options change.