This is a more appropriate place for it, and will also be useful in the
following commit.

This merges Libav commit d2e56cf7. It was previously skipped.
Signed-off-by: wm4 <nfxjfg@googlemail.com>