From 1fe9a1d773270a0af5476b8b62d96419bbcee9d7 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:05:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/wrapper.hpp | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index 662f87d..43e3f61 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -84,9 +84,8 @@
int fps_;
};
- uint8_t* Decode(const char *file, const int gb, int *w, int *h);
-
- void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
+ void *CreateEncoder(const int w, const int h, const int fps, const int br,
+ const int pix_fmt, const int scale_flag, const int gi);
void DestroyEncoder(void *h);
int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
int GetGb28181Pic(const char *filename, char *retData, int *retDataLen);
--
Gitblit v1.8.0