-
Conflicts: .vscode/launch.json build/Makefile src/demo/main_dvpp.cpp src/interface/FFNvDecoderManager.cpp
-
Conflicts: .vscode/launch.json src/Makefile src/main.cpp
-
Conflicts: src/FFNvDecoder.cpp src/Makefile src/main.cpp
-
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
-
Dev wsl See merge request !3
-
2.添加DECODE_FINISHED_CALLBACK 3.添加isPausing接口 4.添加getCachedQueueLength接口 5.添加snapshot和releaseFFImgInfo接口 6.测试代码添加log回调的自定义设置
-
提交相关文档