Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:30:57 +0000 (23:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 21:31:01 +0000 (23:31 +0200)
* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
  lavfi: add const to the pads parameter of avfilter_pad_get_name/type
  lavfi: add const to AVFilterContext.filter.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/avfilter.c
libavfilter/avfilter.h

Simple merge
@@@ -505,9 -437,9 +505,9 @@@ typedef struct AVFilter 
  
  /** An instance of a filter */
  struct AVFilterContext {
 -    const AVClass *av_class;              ///< needed for av_log()
 +    const AVClass *av_class;        ///< needed for av_log()
  
-     AVFilter *filter;               ///< the AVFilter of which this is an instance
+     const AVFilter *filter;         ///< the AVFilter of which this is an instance
  
      char *name;                     ///< name of this filter instance