diff options
| author | Anton Khirnov <anton@khirnov.net> | 2024-08-06 08:50:21 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-08-15 19:34:27 +0200 |
| commit | a23d565ea7d41e61f160578f9714a23e695f3bfd (patch) | |
| tree | 4f49446e8da10c5496cffbd1e0e3270b61ca7381 /libavfilter/avfilter.c | |
| parent | d6318a244d1dde48c1429c48b4076df47c2c7fe9 (diff) | |
| download | ffmpeg-a23d565ea7d41e61f160578f9714a23e695f3bfd.tar.gz | |
lavfi: move AVFilterLink.frame_rate to FilterLink
Co-developed-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9b72b6162f..66dda6584d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -340,6 +340,7 @@ int ff_filter_config_links(AVFilterContext *filter) AVFilterLink *link = filter->inputs[i]; AVFilterLink *inlink; FilterLinkInternal *li = ff_link_internal(link); + FilterLinkInternal *li_in; if (!link) continue; if (!link->src || !link->dst) { @@ -349,6 +350,7 @@ int ff_filter_config_links(AVFilterContext *filter) } inlink = link->src->nb_inputs ? link->src->inputs[0] : NULL; + li_in = inlink ? ff_link_internal(inlink) : NULL; li->l.current_pts = li->l.current_pts_us = AV_NOPTS_VALUE; @@ -389,8 +391,8 @@ int ff_filter_config_links(AVFilterContext *filter) inlink->sample_aspect_ratio : (AVRational){1,1}; if (inlink) { - if (!link->frame_rate.num && !link->frame_rate.den) - link->frame_rate = inlink->frame_rate; + if (!li->l.frame_rate.num && !li->l.frame_rate.den) + li->l.frame_rate = li_in->l.frame_rate; if (!link->w) link->w = inlink->w; if (!link->h) |