diff options
| -rw-r--r-- | libavfilter/buffersrc.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_frei0r.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_pad.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_vflip.c | 3 | ||||
| -rw-r--r-- | libavfilter/vf_yadif.c | 5 | ||||
| -rw-r--r-- | libavfilter/vsrc_color.c | 3 | ||||
| -rw-r--r-- | libavfilter/vsrc_testsrc.c | 3 |
7 files changed, 23 insertions, 0 deletions
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 16a38a655e..c0cc3a3fff 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -92,6 +92,9 @@ int av_buffersrc_write_frame(AVFilterContext *buffer_filter, AVFrame *frame) frame->format); buf = ff_get_video_buffer(buffer_filter->outputs[0], AV_PERM_WRITE, c->w, c->h); + if (!buf) + return AVERROR(ENOMEM); + av_image_copy(buf->data, buf->linesize, frame->data, frame->linesize, c->pix_fmt, c->w, c->h); break; diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index 152795f5b6..606c5e2d32 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -441,6 +441,9 @@ static int source_request_frame(AVFilterLink *outlink) AVFilterBufferRef *buf_out; int ret; + if (!picref) + return AVERROR(ENOMEM); + picref->video->pixel_aspect = (AVRational) {1, 1}; picref->pts = frei0r->pts++; picref->pos = -1; diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index 262a416488..ed2e2e0891 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -262,6 +262,9 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *inlink, int perms, int h + (pad->h - pad->in_h)); int plane; + if (!picref) + return NULL; + picref->video->w = w; picref->video->h = h; diff --git a/libavfilter/vf_vflip.c b/libavfilter/vf_vflip.c index b3143229b1..f0fb32aadc 100644 --- a/libavfilter/vf_vflip.c +++ b/libavfilter/vf_vflip.c @@ -52,6 +52,9 @@ static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, return ff_default_get_video_buffer(link, perms, w, h); picref = ff_get_video_buffer(link->dst->outputs[0], perms, w, h); + if (!picref) + return NULL; + for (i = 0; i < 4; i ++) { int vsub = i == 1 || i == 2 ? flip->vsub : 0; diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index db4956c2cc..c6d78a5ae9 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -173,6 +173,9 @@ static int return_frame(AVFilterContext *ctx, int is_second) if (is_second) { yadif->out = ff_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | AV_PERM_REUSE, link->w, link->h); + if (!yadif->out) + return AVERROR(ENOMEM); + avfilter_copy_buffer_ref_props(yadif->out, yadif->cur); yadif->out->video->interlaced = 0; } @@ -239,6 +242,8 @@ static int start_frame(AVFilterLink *link, AVFilterBufferRef *picref) yadif->out = ff_get_video_buffer(ctx->outputs[0], AV_PERM_WRITE | AV_PERM_PRESERVE | AV_PERM_REUSE, link->w, link->h); + if (!yadif->out) + return AVERROR(ENOMEM); avfilter_copy_buffer_ref_props(yadif->out, yadif->cur); yadif->out->video->interlaced = 0; diff --git a/libavfilter/vsrc_color.c b/libavfilter/vsrc_color.c index 0fa6853189..ec83f03c5c 100644 --- a/libavfilter/vsrc_color.c +++ b/libavfilter/vsrc_color.c @@ -145,6 +145,9 @@ static int color_request_frame(AVFilterLink *link) AVFilterBufferRef *buf_out; int ret; + if (!picref) + return AVERROR(ENOMEM); + picref->video->pixel_aspect = (AVRational) {1, 1}; picref->pts = color->pts++; picref->pos = -1; diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 22528b4650..42cd58ed89 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -135,6 +135,9 @@ static int request_frame(AVFilterLink *outlink) if (test->max_pts >= 0 && test->pts > test->max_pts) return AVERROR_EOF; picref = ff_get_video_buffer(outlink, AV_PERM_WRITE, test->w, test->h); + if (!picref) + return AVERROR(ENOMEM); + picref->pts = test->pts++; picref->pos = -1; picref->video->key_frame = 1; |