diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-14 16:43:35 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-18 16:38:09 +0100 |
| commit | 40b91eaea954df69f736c4e8f565b80c23bffd0f (patch) | |
| tree | 661e5039b54cbc3d1500f47b991de830b2c417fc | |
| parent | 89eea4e19aad9b9dae46731bf87e493e3c6ce1c8 (diff) | |
avfilter/avfilter: Move init_state to FilterLinkInternal
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavfilter/avfilter.c | 7 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 7 | ||||
| -rw-r--r-- | libavfilter/avfilter_internal.h | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 60d5e3ac32..ba95719853 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -322,6 +322,7 @@ int avfilter_config_links(AVFilterContext *filter) for (i = 0; i < filter->nb_inputs; i ++) { AVFilterLink *link = filter->inputs[i]; AVFilterLink *inlink; + FilterLinkInternal *li = ff_link_internal(link); if (!link) continue; if (!link->src || !link->dst) { @@ -334,14 +335,14 @@ int avfilter_config_links(AVFilterContext *filter) link->current_pts = link->current_pts_us = AV_NOPTS_VALUE; - switch (link->init_state) { + switch (li->init_state) { case AVLINK_INIT: continue; case AVLINK_STARTINIT: av_log(filter, AV_LOG_INFO, "circular filter chain detected\n"); return 0; case AVLINK_UNINIT: - link->init_state = AVLINK_STARTINIT; + li->init_state = AVLINK_STARTINIT; if ((ret = avfilter_config_links(link->src)) < 0) return ret; @@ -412,7 +413,7 @@ int avfilter_config_links(AVFilterContext *filter) return ret; } - link->init_state = AVLINK_INIT; + li->init_state = AVLINK_INIT; } } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 1d2909e28d..5c6e34e8fc 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -611,13 +611,6 @@ struct AVFilterLink { */ AVFilterFormatsConfig outcfg; - /** stage of the initialization of the link properties (dimensions, etc) */ - enum { - AVLINK_UNINIT = 0, ///< not started - AVLINK_STARTINIT, ///< started, but incomplete - AVLINK_INIT ///< complete - } init_state; - /** * Graph the filter belongs to. */ diff --git a/libavfilter/avfilter_internal.h b/libavfilter/avfilter_internal.h index e6c10ddec0..a50ffa102d 100644 --- a/libavfilter/avfilter_internal.h +++ b/libavfilter/avfilter_internal.h @@ -63,6 +63,13 @@ typedef struct FilterLinkInternal { * corresponding code. */ int status_out; + + /** stage of the initialization of the link properties (dimensions, etc) */ + enum { + AVLINK_UNINIT = 0, ///< not started + AVLINK_STARTINIT, ///< started, but incomplete + AVLINK_INIT ///< complete + } init_state; } FilterLinkInternal; static inline FilterLinkInternal *ff_link_internal(AVFilterLink *link) |