From e6725cb3cf4ced3a6985d4d3db4d5cf1336a30d8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 19 七月 2019 16:53:35 +0800
Subject: [PATCH] merge so

---
 cffmpeg.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cffmpeg.h b/cffmpeg.h
index 1eb6536..c7bf9d1 100644
--- a/cffmpeg.h
+++ b/cffmpeg.h
@@ -17,6 +17,8 @@
 void c_ffmpeg_run(const cffmpeg h, const char *input);
 
 void c_ffmpeg_scale(const cffmpeg h, const int wid, const int hei, const int flags);
+void c_ffmpeg_run_gb28181(const cffmpeg h);
+void c_ffmepg_use_cpu(const cffmpeg h);
 /////////passive api
 void c_ffmpeg_build_recorder(const cffmpeg h, const char *dir, int mind, int maxd);
 void c_ffmpeg_fire_recorder(const cffmpeg h, const int64_t id);

--
Gitblit v1.8.0