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.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index 16cb761..d083536 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -17,6 +17,8 @@ typedef void (*lib_cffmpeg_destroy)(const cffmpeg); typedef void (*lib_cffmpeg_run)(const cffmpeg, const char*); typedef void (*lib_cffmpeg_scale)(const cffmpeg, const int, const int, const int); +typedef void (*lib_cffmpeg_gb28181)(const cffmpeg); +typedef void (*lib_cffmpeg_cpu)(const cffmpeg); typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, int, int); typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const int64_t); typedef char*(*lib_cffmpeg_info_recorder)(const cffmpeg, int*, int*); @@ -30,6 +32,8 @@ static lib_cffmpeg_destroy fn_destroy = NULL; static lib_cffmpeg_run fn_run = NULL; static lib_cffmpeg_scale fn_scale = NULL; +static lib_cffmpeg_gb28181 fn_gb28181 = NULL; +static lib_cffmpeg_cpu fn_cpu = NULL; static lib_cffmpeg_recorder fn_recorder = NULL; static lib_cffmpeg_fire_recorder fn_fire_recorder = NULL; static lib_cffmpeg_info_recorder fn_info_recorder = NULL; @@ -47,6 +51,8 @@ void wrap_fn_destroy(const cffmpeg h); void wrap_fn_run(const cffmpeg h, const char* input); void wrap_fn_scale(const cffmpeg h, const int wid, const int hei, const int flags); +void wrap_fn_run_gb28181(const cffmpeg h); +void wrap_fn_use_cpu(const cffmpeg h); void wrap_fn_recorder(const cffmpeg h, const char* dir, int mind, int maxd); void wrap_fn_fire_recorder(const cffmpeg h, const int64_t id); char* wrap_fn_info_recorder(const cffmpeg, int*, int*); -- Gitblit v1.8.0