Fix Libav build

Mike Boers
2023-03-20T14:51:41Z

Mark's changes here.

There are a few things to consider simplifying before moving forward. See comments in code.