Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 14:11:22 +0000 (16:11 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 5 Sep 2015 14:11:22 +0000 (16:11 +0200)
* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
  lavfi: Drop deprecated *_count suffixed variables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h

Simple merge
Simple merge
Simple merge
@@@ -266,31 -165,19 +266,19 @@@ int ff_insert_pad(unsigned idx, unsigne
                     AVFilterPad *newpad);
  
  /** Insert a new input pad for the filter. */
 -static inline void ff_insert_inpad(AVFilterContext *f, unsigned index,
 +static inline int ff_insert_inpad(AVFilterContext *f, unsigned index,
                                     AVFilterPad *p)
  {
-     int ret = ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),
 -    ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),
++    return ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),
                    &f->input_pads, &f->inputs, p);
- #if FF_API_FOO_COUNT
- FF_DISABLE_DEPRECATION_WARNINGS
-     f->input_count = f->nb_inputs;
- FF_ENABLE_DEPRECATION_WARNINGS
- #endif
-     return ret;
  }
  
  /** Insert a new output pad for the filter. */
 -static inline void ff_insert_outpad(AVFilterContext *f, unsigned index,
 +static inline int ff_insert_outpad(AVFilterContext *f, unsigned index,
                                      AVFilterPad *p)
  {
-     int ret = ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),
 -    ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),
++    return ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),
                    &f->output_pads, &f->outputs, p);
- #if FF_API_FOO_COUNT
- FF_DISABLE_DEPRECATION_WARNINGS
-     f->output_count = f->nb_outputs;
- FF_ENABLE_DEPRECATION_WARNINGS
- #endif
-     return ret;
  }
  
  /**
Simple merge