Updates for ffmpeg 6.0

[dubhater]

Thanks!

I didn't inspect your changes too closely. I assume you know what you're doing.