From 64fed650d429fdbdfa4011956a2c057dd0348914 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期三, 13 十一月 2019 14:21:59 +0800
Subject: [PATCH] bug fix
---
csrc/cffmpeg.cpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 6e54de4..176e1fb 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -33,6 +33,11 @@
s->RunStream(input);
}
+int c_ffmpeg_get_fps(const cffmpeg h){
+ Wrapper *s = (Wrapper*)h;
+ return s->GetFPS();
+}
+
void c_ffmpeg_run_gb28181(const cffmpeg h){
Wrapper *s = (Wrapper*)h;
s->GB28181();
@@ -110,8 +115,8 @@
}
// pic encoder
-void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi){
- return CreateEncoder(w, h, fps, br, scale_flag, gi);
+void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi, const int fmt, const char *file){
+ return CreateEncoder(w, h, fps, br, scale_flag, gi, fmt, file);
}
void c_ffmpeg_destroy_encoder(void *h){
--
Gitblit v1.8.0