virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avfilter/vf_pad: Fix segfault if reconfiguration fails

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-01-02 18:19:54 +01:00
parent 28307ef7e6
commit 3d8a8fd27e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/vf_pad.c
View File

@@ -210,12 +210,16 @@ static int config_output(AVFilterLink *outlink)
static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h) static AVFrame *get_video_buffer(AVFilterLink *inlink, int w, int h)
{ {
PadContext *s = inlink->dst->priv; PadContext *s = inlink->dst->priv;
AVFrame *frame;
AVFrame *frame = ff_get_video_buffer(inlink->dst->outputs[0],
w + (s->w - s->in_w),
h + (s->h - s->in_h) + (s->x > 0));
int plane; int plane;
if (s->inlink_w <= 0)
return NULL;
frame = ff_get_video_buffer(inlink->dst->outputs[0],
w + (s->w - s->in_w),
h + (s->h - s->in_h) + (s->x > 0));
if (!frame) if (!frame)
return NULL; return NULL;