Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2017-06-17 01:11:51 +0300
committerMark Thompson <sw@jkqxz.net>2017-06-18 19:01:31 +0300
commita670eea56087d0ecd4fbeccf3a9beb9110b7031f (patch)
treedd868ad7a3d75c7fd59e822514759a976aa5e273 /libavfilter/vf_hwmap.c
parent5635c80bf59d90e63ede473e2c014647850a8446 (diff)
vf_hwmap: Properly free a locally derived device
Diffstat (limited to 'libavfilter/vf_hwmap.c')
-rw-r--r--libavfilter/vf_hwmap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c
index 48ebbb6bd6..b28cb21456 100644
--- a/libavfilter/vf_hwmap.c
+++ b/libavfilter/vf_hwmap.c
@@ -54,7 +54,7 @@ static int hwmap_config_output(AVFilterLink *outlink)
AVHWFramesContext *hwfc;
AVBufferRef *device;
const AVPixFmtDescriptor *desc;
- int err;
+ int err, device_is_derived;
av_log(avctx, AV_LOG_DEBUG, "Configure hwmap %s -> %s.\n",
av_get_pix_fmt_name(inlink->format),
@@ -63,6 +63,7 @@ static int hwmap_config_output(AVFilterLink *outlink)
av_buffer_unref(&ctx->hwframes_ref);
device = avctx->hw_device_ctx;
+ device_is_derived = 0;
if (inlink->hw_frames_ctx) {
hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data;
@@ -84,6 +85,7 @@ static int hwmap_config_output(AVFilterLink *outlink)
"device context: %d.\n", err);
goto fail;
}
+ device_is_derived = 1;
}
desc = av_pix_fmt_desc_get(outlink->format);
@@ -238,9 +240,13 @@ static int hwmap_config_output(AVFilterLink *outlink)
outlink->w = inlink->w;
outlink->h = inlink->h;
+ if (device_is_derived)
+ av_buffer_unref(&device);
return 0;
fail:
+ if (device_is_derived)
+ av_buffer_unref(&device);
av_buffer_unref(&ctx->hwframes_ref);
return err;
}