virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

Merge commit 'a6653787a4b1e89170ff7962312dd110769c83a3'

Browse Source 
* commit 'a6653787a4b1e89170ff7962312dd110769c83a3':
  libopencv: Check kernel_str life cycle

Conflicts:
	libavfilter/vf_libopencv.c

See: f16a6f667c993a158643b52815ec42961508b0a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-03 23:34:10 +01:00
commit 1dc1c4e7a8
1 changed files with 13 additions and 8 deletions

21
libavfilter/vf_libopencv.c

@ -261,19 +261,24 @@ static av_cold int dilate_init(AVFilterContext *ctx, const char *args)
OCVContext *s = ctx->priv; OCVContext *s = ctx->priv;
DilateContext *dilate = s->priv; DilateContext *dilate = s->priv;
char default_kernel_str[] = "3x3+0x0/rect"; char default_kernel_str[] = "3x3+0x0/rect";
char *kernel_str; char *kernel_str = NULL;
const char *buf = args; const char *buf = args;
int ret; int ret;
if (args) if (args) {
kernel_str = av_get_token(&buf, "|"); kernel_str = av_get_token(&buf, "|");
else
kernel_str = av_strdup(default_kernel_str); if (!kernel_str)
if (!kernel_str) return AVERROR(ENOMEM);
return AVERROR(ENOMEM); }
if ((ret = parse_iplconvkernel(&dilate->kernel, kernel_str, ctx)) < 0)
return ret; ret = parse_iplconvkernel(&dilate->kernel,
(!kernel_str || !*kernel_str) ? default_kernel_str
: kernel_str,
ctx);
av_free(kernel_str); av_free(kernel_str);
if (ret < 0)
return ret;
if (!buf || sscanf(buf, "|%d", &dilate->nb_iterations) != 1) if (!buf || sscanf(buf, "|%d", &dilate->nb_iterations) != 1)
dilate->nb_iterations = 1; dilate->nb_iterations = 1;