Fix build on Libav (again)

....

This time actually tested with an actual Libav copy.