merge master

This commit is contained in:
AiYangSky
2023-11-28 11:34:37 +08:00
10 changed files with 148 additions and 153 deletions

View File

@@ -326,7 +326,7 @@ protected:
};
enum class CameraType {NONE, WEBCAM, G1, Q10, MIPI, GX40};
enum class CameraType {NONE, WEBCAM, V4L2CAM, G1, Q10, MIPI, GX40};
class CameraBase {
public: