github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/vf_libopencv: fix memleak

Browse Source 
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2025-12-23 00:32:44 +08:00
parent ee5d6e7ee1
commit 4d46eeed02
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/vf_libopencv.c
View File

@@ -36,9 +36,9 @@
#include "formats.h"
#include "video.h"
static void fill_iplimage_from_frame(IplImage *img, const AVFrame *frame, enum AVPixelFormat pixfmt)
static void fill_iplimage_from_frame(IplImage **_img, const AVFrame *frame, enum AVPixelFormat pixfmt)
{
IplImage *tmpimg;
IplImage *img;
int depth, channels_nb;
if (pixfmt == AV_PIX_FMT_GRAY8) { depth = IPL_DEPTH_8U; channels_nb = 1; }
@@ -46,8 +46,7 @@ static void fill_iplimage_from_frame(IplImage *img, const AVFrame *frame, enum A
else if (pixfmt == AV_PIX_FMT_BGR24) { depth = IPL_DEPTH_8U; channels_nb = 3; }
else return;
tmpimg = cvCreateImageHeader((CvSize){frame->width, frame->height}, depth, channels_nb);
*img = *tmpimg;
*_img = img = cvCreateImageHeader((CvSize){frame->width, frame->height}, depth, channels_nb);
img->imageData = img->imageDataOrigin = frame->data[0];
img->dataOrder = IPL_DATA_ORDER_PIXEL;
img->origin = IPL_ORIGIN_TL;
@@ -366,7 +365,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
OCVContext *s = ctx->priv;
AVFilterLink *outlink= inlink->dst->outputs[0];
AVFrame *out;
IplImage inimg, outimg;
IplImage *inimg, *outimg;
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) {
@@ -377,10 +376,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
fill_iplimage_from_frame(&inimg , in , inlink->format);
fill_iplimage_from_frame(&outimg, out, inlink->format);
s->end_frame_filter(ctx, &inimg, &outimg);
fill_frame_from_iplimage(out, &outimg, inlink->format);
s->end_frame_filter(ctx, inimg, outimg);
fill_frame_from_iplimage(out, outimg, inlink->format);
av_frame_free(&in);
cvReleaseImageHeader(&inimg);
cvReleaseImageHeader(&outimg);
return ff_filter_frame(outlink, out);
}