History

lavfi: add a function for counting elements in AVFilterPad arrays.

The caller needs to know what valid indices can be passed to avfilter_pad_get_name/type.

Anton Khirnov committed 13 years ago

Commit 7e8fe4b1 parent 7cdd7373 files · +10 −3Browse files

Unified · Split

3 files
  1. doc/APIchanges +1 −0
  2. libavfilter/avfilter.c +3 −3
  3. libavfilter/avfilter.h +6 −0
doc/APIchanges+1−0
@@ -23,6 +23,7 @@ API changes, most recent first: · 22 unmodified lines
2323 Add avfilter_init_str(), deprecate avfilter_init_filter().
2424 Add avfilter_init_dict().
2525 Add AVFilter.flags field and AVFILTER_FLAG_DYNAMIC_{INPUTS,OUTPUTS} flags.
26+ Add avfilter_pad_count() for counting filter inputs/outputs.
2627
2728 2013-xx-xx - lavfi 3.7.0 - avfilter.h
2829 Add AVFilter.priv_class for exporting filter options through the AVOptions API
libavfilter/avfilter.c+3−3
@@ -304,7 +304,7 @@ void avfilter_uninit(void) · 303 unmodified lines
304304 next_registered_avfilter_idx = 0;
305305 }
306306
307−static int pad_count(const AVFilterPad *pads)
307+int avfilter_pad_count(const AVFilterPad *pads)
308308 {
309309 int count;
310310
@@ -377,7 +377,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) · 66 unmodified lines
377377 av_opt_set_defaults(ret->priv);
378378 }
379379
380− ret->nb_inputs = pad_count(filter->inputs);
380+ ret->nb_inputs = avfilter_pad_count(filter->inputs);
381381 if (ret->nb_inputs ) {
382382 ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_inputs);
383383 if (!ret->input_pads)
@@ -388,7 +388,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name) · 4 unmodified lines
388388 goto err;
389389 }
390390
391− ret->nb_outputs = pad_count(filter->outputs);
391+ ret->nb_outputs = avfilter_pad_count(filter->outputs);
392392 if (ret->nb_outputs) {
393393 ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_outputs);
394394 if (!ret->output_pads)
libavfilter/avfilter.h+6−0
@@ -350,6 +350,12 @@ struct AVFilterPad { · 349 unmodified lines
350350 };
351351 #endif
352352
353+/**
354+ * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
355+ * AVFilter.inputs/outputs).
356+ */
357+int avfilter_pad_count(const AVFilterPad *pads);
358+
353359 /**
354360 * Get the name of an AVFilterPad.
355361 *

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t