Undid some small changes to keep the complete libav-11beta change small

Signed-off-by: Michel Verbraak <info@1st-setup.nl>