Oh, and does this have to be backed out when we actually upgrade to ffmpeg 6.0/6.1 ??  I am confused by the patches name including 6.0 in it.

0002-Fix-build-in-pluginfclient.C-with-ffmpeg-6.0.patch