From f29f269d999fc4bb8a9bfa85629f08b89971a2ef Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 03 十二月 2019 16:00:49 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/ffmpeg/bridge/cvbridge.cpp | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/csrc/ffmpeg/bridge/cvbridge.cpp b/csrc/ffmpeg/bridge/cvbridge.cpp
index 21d09a1..0749f12 100644
--- a/csrc/ffmpeg/bridge/cvbridge.cpp
+++ b/csrc/ffmpeg/bridge/cvbridge.cpp
@@ -62,11 +62,13 @@
return NULL;
}
- if(!scale_->scaleFrame(in, pic_->getAVFrame())){
- return NULL;
- }
-
- return av_frame_clone(pic_->getAVFrame());
+ uint8_t *out = convert2Data(in);
+ AVFrame *frm = NULL;
+ if (out){
+ frm = fillFrame(out, scale_->dstW_, scale_->dstH_, scale_->dstFmt_);
+ }
+ free(out);
+ return frm;
}
/////////////////////////////////////////////////////////////////
--
Gitblit v1.8.0