X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Favfilter.c;h=3a2a6c2a60303b9b02ff1fea49ff3625c8a8113d;hb=34e4c588c8e86fc407f8a67942434949f51b7da6;hp=2f4d59f3168e9b11c21f3b8a6da9a05b5ed09233;hpb=58dd885f9ae7feee002773253e345e11e7142739;p=ffmpeg diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 2f4d59f3168..3a2a6c2a603 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -22,9 +22,11 @@ #include "libavutil/atomic.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/buffer.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/eval.h" +#include "libavutil/hwcontext.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/opt.h" @@ -322,6 +324,17 @@ int avfilter_config_links(AVFilterContext *filter) return ret; } + if (link->src->nb_inputs && link->src->inputs[0]->hw_frames_ctx && + !link->hw_frames_ctx) { + AVHWFramesContext *input_ctx = (AVHWFramesContext*)link->src->inputs[0]->hw_frames_ctx->data; + + if (input_ctx->format == link->format) { + link->hw_frames_ctx = av_buffer_ref(link->src->inputs[0]->hw_frames_ctx); + if (!link->hw_frames_ctx) + return AVERROR(ENOMEM); + } + } + link->init_state = AVLINK_INIT; } } @@ -715,6 +728,8 @@ static void free_link(AVFilterLink *link) if (link->dst) link->dst->inputs[link->dstpad - link->dst->input_pads] = NULL; + av_buffer_unref(&link->hw_frames_ctx); + ff_formats_unref(&link->in_formats); ff_formats_unref(&link->out_formats); ff_formats_unref(&link->in_samplerates);