From: Anton Khirnov Date: Thu, 21 Jun 2012 09:48:58 +0000 (+0200) Subject: lavfi: reorder AVFilterContext fields. X-Git-Tag: android-x86-4.4-r1~8529^2~1564 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f892013ac47cf1dd3c0c2d1ccb08a7822e869efa;p=android-x86%2Fexternal-ffmpeg.git lavfi: reorder AVFilterContext fields. Place related fields together, remove holes. --- diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index bbbc53ed0f..1761488ac2 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -417,22 +417,21 @@ struct AVFilterContext { char *name; ///< name of this filter instance + AVFilterPad *input_pads; ///< array of input pads + AVFilterLink **inputs; ///< array of pointers to input links #if FF_API_FOO_COUNT unsigned input_count; ///< @deprecated use nb_inputs #endif - AVFilterPad *input_pads; ///< array of input pads - AVFilterLink **inputs; ///< array of pointers to input links + unsigned nb_inputs; ///< number of input pads + AVFilterPad *output_pads; ///< array of output pads + AVFilterLink **outputs; ///< array of pointers to output links #if FF_API_FOO_COUNT unsigned output_count; ///< @deprecated use nb_outputs #endif - AVFilterPad *output_pads; ///< array of output pads - AVFilterLink **outputs; ///< array of pointers to output links + unsigned nb_outputs; ///< number of output pads void *priv; ///< private data for use by the filter - - unsigned nb_inputs; ///< number of input pads - unsigned nb_outputs; ///< number of output pads }; /**