diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:11:22 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:11:22 +0200 |
| commit | 43e2e172dfbd734947c30bdbfa8f19b7ca95576d (patch) | |
| tree | ca119d48d13e8f9905f10b0cba11ddbb77f811d2 /libavfilter/internal.h | |
| parent | 2751d5f0ba2e4da18fe72d91d317423f1662dd9b (diff) | |
| parent | e65e4cbbda03ca3c9087f069c9867d518415fca1 (diff) | |
| download | ffmpeg-43e2e172dfbd734947c30bdbfa8f19b7ca95576d.tar.gz | |
Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'
* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
lavfi: Drop deprecated *_count suffixed variables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter/internal.h')
| -rw-r--r-- | libavfilter/internal.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 75c34360e4..17803c0371 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -269,28 +269,16 @@ int ff_insert_pad(unsigned idx, unsigned *count, size_t padidx_off, static inline int ff_insert_inpad(AVFilterContext *f, unsigned index, AVFilterPad *p) { - int ret = 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 int ff_insert_outpad(AVFilterContext *f, unsigned index, AVFilterPad *p) { - int ret = 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; } /** |