Merge commit '4d1f31ea44f82adfb2b712534d71e27233a4f785'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:42:49 +0000 (10:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 08:42:49 +0000 (10:42 +0200)
* commit '4d1f31ea44f82adfb2b712534d71e27233a4f785':
  lavfi: make AVFilterContext export filter options.

Conflicts:
libavfilter/avfilter.c

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

@@@ -463,21 -331,16 +463,21 @@@ static void *filter_child_next(void *ob
  
  static const AVClass *filter_child_class_next(const AVClass *prev)
  {
-     AVFilter **filter_ptr = NULL;
+     AVFilter **f = NULL;
  
-     while (prev && *(filter_ptr = av_filter_next(filter_ptr)))
-         if ((*filter_ptr)->priv_class == prev)
 +    /* find the filter that corresponds to prev */
+     while (prev && *(f = av_filter_next(f)))
+         if ((*f)->priv_class == prev)
              break;
  
-     if (prev && !(*filter_ptr))
 +    /* could not find filter corresponding to prev */
-     while (*(filter_ptr = av_filter_next(filter_ptr)))
-         if ((*filter_ptr)->priv_class)
-             return (*filter_ptr)->priv_class;
++    if (prev && !(*f))
 +        return NULL;
 +
 +    /* find next filter with specific options */
 -
+     while (*(f = av_filter_next(f)))
+         if ((*f)->priv_class)
+             return (*f)->priv_class;
      return NULL;
  }