[Cin] Fwd: ffmpeg.git unconditional fixes