From 7c633d177d37dbe54648c194ea2632a59eb92911 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 24 九月 2019 13:50:18 +0800
Subject: [PATCH] update ffmpeg decode and audio rec
---
csrc/cffmpeg.cpp | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp
index eea69f8..9365842 100644
--- a/csrc/cffmpeg.cpp
+++ b/csrc/cffmpeg.cpp
@@ -103,12 +103,8 @@
}
/////////////////////test
-void* c_ffmpeg_decode_jpeg(const char *file, int *wid, int *hei){
- uint8_t *p = DecodeJPEG(file, wid, hei);
- if(!p){
- *wid = *hei = 0;
- }
- return p;
+void* c_ffmpeg_decode(const char *file, const int gb, int *wid, int *hei){
+ return Decode(file, gb, wid, hei);
}
// pic encoder
--
Gitblit v1.8.0