mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-11 09:35:22 +00:00
lavfi/formats: cosmetic: move negotiation stuff at the end
It was between AVFilterFormats and AVFilterChannelLayouts.
This commit is contained in:
parent
7871b3ca5e
commit
703c3c4151
@ -69,21 +69,6 @@ struct AVFilterFormats {
|
|||||||
struct AVFilterFormats ***refs; ///< references to this list
|
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.
|
* 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);
|
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 */
|
#endif /* AVFILTER_FORMATS_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user