From 927a49bc04984400cb9b968e41d299cc977e4988 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期一, 16 九月 2019 12:54:33 +0800 Subject: [PATCH] update so file --- libcffmpeg.h | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index cbcf14c..cf8d212 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -18,12 +18,11 @@ typedef void (*lib_cffmpeg_cpu)(const cffmpeg); typedef void (*lib_cffmpeg_recorder)(const cffmpeg, const char*, const char*, int, int); typedef void (*lib_cffmpeg_fire_recorder)(const cffmpeg, const char*, const int64_t); -typedef char*(*lib_cffmpeg_info_recorder)(const cffmpeg, int*, int*); -typedef char*(*lib_cffmpeg_rec_id)(const cffmpeg, const char*, int*); +typedef void (*lib_cffmpeg_info_recorder)(const cffmpeg, int*, char**, int*, char**, int*); typedef void (*lib_cffmpeg_decoder)(const cffmpeg); typedef void*(*lib_cffmpeg_pic)(const cffmpeg, int*, int*, int64_t*); typedef void*(*lib_cffmpeg_avpacket)(const cffmpeg, int*, int*); -typedef void*(*lib_cffmpeg_decode_jpeg)(const cffmpeg, const char*, int*, int*); +typedef void*(*lib_cffmpeg_decode_jpeg)(const char*, int*, int*); static lib_cffmpeg_create fn_create = NULL; static lib_cffmpeg_destroy fn_destroy = NULL; @@ -34,7 +33,6 @@ 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; -static lib_cffmpeg_rec_id fn_rec_id = NULL; static lib_cffmpeg_decoder fn_decoder = NULL; static lib_cffmpeg_pic fn_decoder_pic = NULL; static lib_cffmpeg_avpacket fn_get_avpacket = NULL; @@ -52,12 +50,11 @@ void wrap_fn_use_cpu(const cffmpeg h); void wrap_fn_recorder(const cffmpeg h, const char* id, const char* dir, int mind, int maxd); void wrap_fn_fire_recorder(const cffmpeg h, const char *sid, const int64_t id); -char* wrap_fn_info_recorder(const cffmpeg, int* index, int* length); -char* wrap_fn_rec_id(const cffmpeg h, const char* path, int*length); +void wrap_fn_info_recorder(const cffmpeg, int* index, char** recid, int* recidLen, char** fpath, int* pathLen); void wrap_fn_decoder(const cffmpeg h); void* wrap_fn_decoder_pic(const cffmpeg h, int* wid, int* hei, int64_t *id); void* wrap_fn_get_avpacket(const cffmpeg h, int* size, int* key); -void* wrap_fn_decode_jpeg(const cffmpeg h, const char* file, int* wid, int* hei); +void* wrap_fn_decode_jpeg(const char* file, int* wid, int* hei); // for encoder -- Gitblit v1.8.0