This merges libav commit ac7bfd69,
which was previously skipped.

(cherry picked from commit ac7bfd69)
Signed-off-by: Mark Thompson <sw@jkqxz.net>