Patch created using revisions ea3d24b..d2aa735 from branch dev/6.0/rpi_import_1 of https://github.com/jc-kynesim/rpi-ffmpeg