From b8c69e1f08f748dd19da3637f23bf680ad14b0ec Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 29 十一月 2019 13:30:38 +0800
Subject: [PATCH] update
---
csrc/cffmpeg.cpp | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index 4cf92da..f42d753 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -109,14 +109,9 @@
return data;
}
-/////////////////////test
-void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei){
- return Decode(file, gb, wid, hei);
-}
-
// 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 pix_fmt, const int scale_flag, const int gi){
+ return CreateEncoder(w, h, fps, br, pix_fmt, scale_flag, gi);
}
void c_ffmpeg_destroy_encoder(void *h){
@@ -125,17 +120,4 @@
int c_ffmpeg_encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key){
return Encode(hdl, in, w, h, out, size, key);
-}
-
-void *c_ffmpeg_create_conv(const int srcW, const int srcH, const int srcFormat,
- const int dstW, const int dstH, const int dstFormat, const int flag){
- return CreateConvertor(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flag);
-}
-
-void *c_ffmpeg_conv(void *h, uint8_t *in){
- return Convert(h, in);
-}
-
-void c_ffmpeg_destroy_conv(void *h){
- DestoryConvertor(h);
}
--
Gitblit v1.8.0