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/cffmpeg.cpp | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp index 3e84f94..fc92229 100644 --- a/csrc/cffmpeg.cpp +++ b/csrc/cffmpeg.cpp @@ -43,6 +43,18 @@ s->GB28181(); } +char * c_ffmpeg_get_gb28181_pic(const char *rtspUrl, int *retDataLen){ + char * retData = (char *)malloc(sizeof(char) * 3000000); + int flag = GetGb28181Pic(rtspUrl, retData, retDataLen); + if(flag == -1){ + free(retData); + *retDataLen = 0; + return NULL; + } + + return retData; +} + void c_ffmepg_use_cpu(const cffmpeg h){ Wrapper *s = (Wrapper*)h; s->CPUDec(); -- Gitblit v1.8.0