Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	engine/DetectDivideEngine/ContainerDivideEngine.cpp
This commit is contained in:
zhangwei 2025-02-13 18:47:06 +08:00
commit 24a6703ea6
2 changed files with 2 additions and 2 deletions

View File

@ -10,7 +10,7 @@ engines:
VideoDecodeEngine: 1 VideoDecodeEngine: 1
VideoDecodeEngine: 2 VideoDecodeEngine: 2
ControlEngine: 0 ControlEngine: 0
SaveMoveImageEngine: 0 # SaveMoveImageEngine: 0
SaveMoveInfoEngine: 0 SaveMoveInfoEngine: 0
ContainerStep1InferenceEngine: 0 ContainerStep1InferenceEngine: 0
CornerInferenceEngine: 0 CornerInferenceEngine: 0

File diff suppressed because one or more lines are too long