From: Anton Khirnov Date: Thu, 21 Jun 2012 09:48:58 +0000 (+0200) Subject: lavfi: reorder AVFilterLink fields. X-Git-Tag: n1.0~12^2~1079 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=83ba22392d046a7dbec247860ad88d8113aac7b0;hp=f892013ac47cf1dd3c0c2d1ccb08a7822e869efa lavfi: reorder AVFilterLink fields. Move private fields to the private section, remove holes. --- diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 1761488ac2..aaf86e9c97 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -448,13 +448,6 @@ struct AVFilterLink { AVFilterContext *dst; ///< dest filter AVFilterPad *dstpad; ///< input pad on the dest filter - /** 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; - enum AVMediaType type; ///< filter media type /* These parameters apply only to video */ @@ -467,26 +460,6 @@ struct AVFilterLink { int format; ///< agreed upon media format - /** - * Lists of formats supported by the input and output filters respectively. - * These lists are used for negotiating the format to actually be used, - * which will be loaded into the format member, above, when chosen. - */ - AVFilterFormats *in_formats; - AVFilterFormats *out_formats; - - /** - * The buffer reference currently being sent across the link by the source - * filter. This is used internally by the filter system to allow - * automatic copying of buffers which do not have sufficient permissions - * for the destination. This should not be accessed directly by the - * filters. - */ - AVFilterBufferRef *src_buf; - - AVFilterBufferRef *cur_buf; - AVFilterBufferRef *out_buf; - /** * Define the time base used by the PTS of the frames/samples * which will pass through this link. @@ -503,6 +476,14 @@ struct AVFilterLink { * New public fields should be added right above. ***************************************************************** */ + /** + * Lists of formats supported by the input and output filters respectively. + * These lists are used for negotiating the format to actually be used, + * which will be loaded into the format member, above, when chosen. + */ + AVFilterFormats *in_formats; + AVFilterFormats *out_formats; + /** * Lists of channel layouts and sample rates used for automatic * negotiation. @@ -520,6 +501,25 @@ struct AVFilterLink { * Last buffer before EOF will be padded with silence. */ int request_samples; + + /** 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; + + /** + * The buffer reference currently being sent across the link by the source + * filter. This is used internally by the filter system to allow + * automatic copying of buffers which do not have sufficient permissions + * for the destination. This should not be accessed directly by the + * filters. + */ + AVFilterBufferRef *src_buf; + + AVFilterBufferRef *cur_buf; + AVFilterBufferRef *out_buf; }; /**