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.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libcffmpeg.c b/libcffmpeg.c
index e1858ba..44838d4 100644
--- a/libcffmpeg.c
+++ b/libcffmpeg.c
@@ -41,8 +41,8 @@
release_if_err(fn_decoder_pic, lib);
fn_get_avpacket = (lib_cffmpeg_avpacket)dlsym(lib, "c_ffmpeg_get_avpacket");
release_if_err(fn_get_avpacket, lib);
- fn_dec_jpeg = (lib_cffmpeg_decode_jpeg)dlsym(lib, "c_ffmpeg_decode_jpeg");
- release_if_err(fn_dec_jpeg, lib);
+ fn_decode = (lib_cffmpeg_decode)dlsym(lib, "c_ffmpeg_decode");
+ release_if_err(fn_decode, lib);
fn_create_encoder = (lib_cffmpeg_create_encoder)dlsym(lib, "c_ffmpeg_create_encoder");
release_if_err(fn_create_encoder, lib);
@@ -63,8 +63,8 @@
}
}
-cffmpeg wrap_fn_create(){
- return fn_create();
+cffmpeg wrap_fn_create(const int log, const char *logfile){
+ return fn_create(log, logfile);
}
void wrap_fn_destroy(const cffmpeg h){
@@ -111,8 +111,9 @@
return fn_get_avpacket(h, size, key);
}
-void* wrap_fn_decode_jpeg(const char* file, int* wid, int* hei){
- return fn_dec_jpeg(file, wid, hei);
+// return val: -1 open error; -2, find stream error; -3, converter create error
+void* wrap_fn_decode(const char* file, const int gb, int* wid, int* hei){
+ return fn_decode(file, gb, wid, hei);
}
// for encoder
--
Gitblit v1.8.0