Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'

* commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa': lavfi: add a function for counting elements in AVFilterPad arrays.

Michael Niedermayer committed 13 years ago

Commit f4db6bf2 parents 16fc24b 7e8fe4b3 files · +10 −3Browse files

Unified · Split

3 files

@@ -170,6 +170,7 @@ API changes, most recent first: · 169 unmodified lines
170	Add avfilter_init_str(), deprecate avfilter_init_filter().	170	Add avfilter_init_str(), deprecate avfilter_init_filter().
171	Add avfilter_init_dict().	171	Add avfilter_init_dict().
172	Add AVFilter.flags field and AVFILTER_FLAG_DYNAMIC_{INPUTS,OUTPUTS} flags.	172	Add AVFilter.flags field and AVFILTER_FLAG_DYNAMIC_{INPUTS,OUTPUTS} flags.
		173	Add avfilter_pad_count() for counting filter inputs/outputs.
173		174
174	2013-xx-xx - lavfi 3.7.0 - avfilter.h	175	2013-xx-xx - lavfi 3.7.0 - avfilter.h
175	Add AVFilter.priv_class for exporting filter options through the AVOptions API	176	Add AVFilter.priv_class for exporting filter options through the AVOptions API

@@ -436,7 +436,7 @@ void avfilter_uninit(void) · 435 unmodified lines
436	next_registered_avfilter_idx = 0;	436	next_registered_avfilter_idx = 0;
437	}	437	}
438		438
439	static int pad_count(const AVFilterPad *pads)	439	int avfilter_pad_count(const AVFilterPad *pads)
440	{	440	{
441	int count;	441	int count;
442		442
@@ -515,7 +515,7 @@ AVFilterContext ff_filter_alloc(const AVFilter filter, const char *inst_name) · 72 unmodified lines
515	av_opt_set_defaults(ret->priv);	515	av_opt_set_defaults(ret->priv);
516	}	516	}
517		517
518	ret->nb_inputs = pad_count(filter->inputs);	518	ret->nb_inputs = avfilter_pad_count(filter->inputs);
519	if (ret->nb_inputs ) {	519	if (ret->nb_inputs ) {
520	ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_inputs);	520	ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_inputs);
521	if (!ret->input_pads)	521	if (!ret->input_pads)
@@ -526,7 +526,7 @@ AVFilterContext ff_filter_alloc(const AVFilter filter, const char *inst_name) · 4 unmodified lines
526	goto err;	526	goto err;
527	}	527	}
528		528
529	ret->nb_outputs = pad_count(filter->outputs);	529	ret->nb_outputs = avfilter_pad_count(filter->outputs);
530	if (ret->nb_outputs) {	530	if (ret->nb_outputs) {
531	ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_outputs);	531	ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_outputs);
532	if (!ret->output_pads)	532	if (!ret->output_pads)

 };
 #endif
+/**
+ * Get the number of elements in a NULL-terminated array of AVFilterPads (e.g.
+ * AVFilter.inputs/outputs).
+ */
+int avfilter_pad_count(const AVFilterPad *pads);
 /**
  * Get the name of an AVFilterPad.
  *

Keyboard shortcuts