From a2a03e83609a570428d0dce35ef649353b5796aa Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 20 九月 2019 11:44:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg

---
 csrc/common/callback.hpp |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/csrc/common/callback.hpp b/csrc/common/callback.hpp
index c9c264b..f1a867a 100644
--- a/csrc/common/callback.hpp
+++ b/csrc/common/callback.hpp
@@ -4,9 +4,6 @@
 #include <string>
 #include <functional>
 
-typedef std::function<void(std::string&, int&)> FUNC_REC;
-typedef std::function<void(void*,int,int)> FUNC_DEC;
-
-typedef std::function<void(int &id_frame, std::string &file_path)> FUNC_REC_INFO;
+typedef std::function<void(std::string &id, int &id_frame, std::string &file_path)> FUNC_REC_INFO;
 
 #endif /* callback_h */

--
Gitblit v1.8.0