RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-25 04:19:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-12 14:49:25 +02:00
commit f4db6bfeb8
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/APIchanges
View File

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

6
libavfilter/avfilter.c
View File

@ -436,7 +436,7 @@ void avfilter_uninit(void)
next_registered_avfilter_idx = 0; next_registered_avfilter_idx = 0;
} }
static int pad_count(const AVFilterPad *pads) int avfilter_pad_count(const AVFilterPad *pads)
{ {
int count; int count;
@ -515,7 +515,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
av_opt_set_defaults(ret->priv); av_opt_set_defaults(ret->priv);
} }
ret->nb_inputs = pad_count(filter->inputs); ret->nb_inputs = avfilter_pad_count(filter->inputs);
if (ret->nb_inputs ) { if (ret->nb_inputs ) {
ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_inputs); ret->input_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_inputs);
if (!ret->input_pads) if (!ret->input_pads)
@ -526,7 +526,7 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter, const char *inst_name)
goto err; goto err;
} }
ret->nb_outputs = pad_count(filter->outputs); ret->nb_outputs = avfilter_pad_count(filter->outputs);
if (ret->nb_outputs) { if (ret->nb_outputs) {
ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_outputs); ret->output_pads = av_malloc(sizeof(AVFilterPad) * ret->nb_outputs);
if (!ret->output_pads) if (!ret->output_pads)

6
libavfilter/avfilter.h
View File

@ -388,6 +388,12 @@ struct AVFilterPad {
}; };
#endif #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. * Get the name of an AVFilterPad.
* *