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
---
libcffmpeg.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index 3b3541f..bd66a10 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -25,6 +25,10 @@
release_if_err(fn_run, lib);
fn_scale = (lib_cffmpeg_scale)dlsym(lib, "c_ffmpeg_scale");
release_if_err(fn_scale, lib);
+ fn_gb28181 = (lib_cffmpeg_gb28181)dlsym(lib, "c_ffmpeg_run_gb28181");
+ release_if_err(fn_gb28181, lib);
+ fn_cpu = (lib_cffmpeg_cpu)dlsym(lib, "c_ffmepg_use_cpu");
+ release_if_err(fn_cpu, lib);
fn_recorder = (lib_cffmpeg_recorder)dlsym(lib, "c_ffmpeg_build_recorder");
release_if_err(fn_recorder, lib);
fn_fire_recorder = (lib_cffmpeg_fire_recorder)dlsym(lib, "c_ffmpeg_fire_recorder");
@@ -77,6 +81,14 @@
fn_scale(h, wid, hei, flags);
}
+void wrap_fn_run_gb28181(const cffmpeg h){
+ fn_gb28181(h);
+}
+
+void wrap_fn_use_cpu(const cffmpeg h){
+ fn_cpu(h);
+}
+
void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd){
fn_recorder(h, dir, mind, maxd);
}
--
Gitblit v1.8.0