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:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-13 16:32:59 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 16:34:06 +0400
commit8bcebf9e4a480de4a904b5843e9ecb74cf44bfdf (patch)
treebaf634156394d6b143873b6c423a1c5819e17b1f /libavfilter/vf_gradfun.c
parent87d263a122f6212c236531f8586598605ecab87c (diff)
parent555000c7d5c1e13043a948ebc48d2939b0ba6536 (diff)
Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'
* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536': h264: check that DPB is allocated before accessing it in flush_dpb() vf_hqdn3d: fix uninitialized variable use vf_gradfun: fix uninitialized variable use Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_gradfun.c')
-rw-r--r--libavfilter/vf_gradfun.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c
index c749534ad9..9e377614ae 100644
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@ -202,12 +202,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
GradFunContext *gf = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0];
AVFrame *out;
- int p, direct = 0;
+ int p, direct;
if (av_frame_is_writable(in)) {
direct = 1;
out = in;
} else {
+ direct = 0;
out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) {
av_frame_free(&in);