diff options
author | Nicolas George <george@nsup.org> | 2021-08-19 17:09:21 +0200 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2021-08-20 10:26:36 +0200 |
commit | 703c3c4151bf47a03ddf168f67a8b1a46834c791 (patch) | |
tree | 29bfa7b1c262aa8871f32b2014a47e10b4251c39 /libavfilter/formats.h | |
parent | 7871b3ca5e8b0d73f1093ea232578ec7cee34b52 (diff) |
lavfi/formats: cosmetic: move negotiation stuff at the end
It was between AVFilterFormats and AVFilterChannelLayouts.
Diffstat (limited to 'libavfilter/formats.h')
-rw-r--r-- | libavfilter/formats.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavfilter/formats.h b/libavfilter/formats.h index ed513c265a..a9cfa14e95 100644 --- a/libavfilter/formats.h +++ b/libavfilter/formats.h @@ -69,21 +69,6 @@ struct AVFilterFormats { struct AVFilterFormats ***refs; ///< references to this list }; -typedef struct AVFilterFormatMerger { - unsigned offset; - int (*merge)(void *a, void *b); - int (*can_merge)(const void *a, const void *b); -} AVFilterFormatsMerger; - -typedef struct AVFilterNegotiation { - unsigned nb; - const AVFilterFormatsMerger *mergers; - const char *conversion_filter; - unsigned conversion_opts_offset; -} AVFilterNegotiation; - -const AVFilterNegotiation *ff_filter_get_negotiation(AVFilterLink *link); - /** * A list of supported channel layouts. * @@ -330,4 +315,19 @@ int ff_formats_check_sample_rates(void *log, const AVFilterFormats *fmts); */ int ff_formats_check_channel_layouts(void *log, const AVFilterChannelLayouts *fmts); +typedef struct AVFilterFormatMerger { + unsigned offset; + int (*merge)(void *a, void *b); + int (*can_merge)(const void *a, const void *b); +} AVFilterFormatsMerger; + +typedef struct AVFilterNegotiation { + unsigned nb; + const AVFilterFormatsMerger *mergers; + const char *conversion_filter; + unsigned conversion_opts_offset; +} AVFilterNegotiation; + +const AVFilterNegotiation *ff_filter_get_negotiation(AVFilterLink *link); + #endif /* AVFILTER_FORMATS_H */ |