ffmpeg | branch: master | Nicolas George <geo...@nsup.org> | Thu Aug 19 17:09:21 2021 +0200| [703c3c4151bf47a03ddf168f67a8b1a46834c791] | committer: Nicolas George
lavfi/formats: cosmetic: move negotiation stuff at the end It was between AVFilterFormats and AVFilterChannelLayouts. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=703c3c4151bf47a03ddf168f67a8b1a46834c791 --- libavfilter/formats.h | 30 +++++++++++++++--------------- 1 file 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 */ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
