From 762251329bca80422a8e65d0cdb36e86e84883cf Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期五, 27 九月 2019 11:11:45 +0800 Subject: [PATCH] bug fix --- libcffmpeg.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libcffmpeg.h b/libcffmpeg.h index ce4d747..47e7b5c 100644 --- a/libcffmpeg.h +++ b/libcffmpeg.h @@ -10,7 +10,7 @@ typedef void* cffmpeg; -typedef cffmpeg(*lib_cffmpeg_create)(); +typedef cffmpeg(*lib_cffmpeg_create)(const int, const char*); 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); @@ -22,7 +22,7 @@ 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 char*, int*, int*); +typedef void*(*lib_cffmpeg_decode)(const char*, const int, int*, int*); static lib_cffmpeg_create fn_create = NULL; static lib_cffmpeg_destroy fn_destroy = NULL; @@ -36,13 +36,13 @@ static lib_cffmpeg_decoder fn_decoder = NULL; static lib_cffmpeg_pic fn_decoder_pic = NULL; static lib_cffmpeg_avpacket fn_get_avpacket = NULL; -static lib_cffmpeg_decode_jpeg fn_dec_jpeg = NULL; +static lib_cffmpeg_decode fn_decode = NULL; typedef void* libcffmpeg; libcffmpeg init_libcffmpeg(const char *so_file); void release_libcffmpeg(libcffmpeg lib); -cffmpeg wrap_fn_create(); +cffmpeg wrap_fn_create(const int log, const char *logfile); 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); @@ -54,7 +54,7 @@ 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 char* file, int* wid, int* hei); +void* wrap_fn_decode(const char* file, const int gb, int* wid, int* hei); // for encoder -- Gitblit v1.8.0