diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-08-28 00:07:22 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-09-23 09:50:09 +0200 |
| commit | 231e50157cc9a7a8b08ba3d0e566279fc6cbb800 (patch) | |
| tree | ec04d590c371575edfa6635f2f41d0112cc7e296 /libavfilter/vf_blend.c | |
| parent | 53319d5c932867bcc84798622dd171b5c19165f0 (diff) | |
| download | ffmpeg-streaming-231e50157cc9a7a8b08ba3d0e566279fc6cbb800.zip ffmpeg-streaming-231e50157cc9a7a8b08ba3d0e566279fc6cbb800.tar.gz | |
lavfi/dualinput: reimplement on top of framesync.
Diffstat (limited to 'libavfilter/vf_blend.c')
| -rw-r--r-- | libavfilter/vf_blend.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 1152361..3bc8eec 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -368,6 +368,7 @@ static int config_output(AVFilterLink *outlink) AVFilterLink *bottomlink = ctx->inputs[BOTTOM]; BlendContext *b = ctx->priv; const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(toplink->format); + int ret; if (toplink->format != bottomlink->format) { av_log(ctx, AV_LOG_ERROR, "inputs must be of same pixel format\n"); @@ -399,6 +400,9 @@ static int config_output(AVFilterLink *outlink) b->vsub = pix_desc->log2_chroma_h; b->nb_planes = av_pix_fmt_count_planes(toplink->format); + if ((ret = ff_dualinput_init(ctx, &b->dinput)) < 0) + return ret; + return 0; } |
