Commit b64077be authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '9676b9a2'

* commit '9676b9a2':
  AVOption: remove an unused function parameter.
  filters.texi: restore mistakenly removed section name for noformat
  avfiltergraph: use sizeof(var) instead of sizeof(type)
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e1b10927 9676b9a2
...@@ -51,7 +51,7 @@ static const AVClass filtergraph_class = { ...@@ -51,7 +51,7 @@ static const AVClass filtergraph_class = {
AVFilterGraph *avfilter_graph_alloc(void) AVFilterGraph *avfilter_graph_alloc(void)
{ {
AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph)); AVFilterGraph *ret = av_mallocz(sizeof(*ret));
if (!ret) if (!ret)
return NULL; return NULL;
ret->av_class = &filtergraph_class; ret->av_class = &filtergraph_class;
...@@ -75,7 +75,7 @@ void avfilter_graph_free(AVFilterGraph **graph) ...@@ -75,7 +75,7 @@ void avfilter_graph_free(AVFilterGraph **graph)
int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
{ {
AVFilterContext **filters = av_realloc(graph->filters, AVFilterContext **filters = av_realloc(graph->filters,
sizeof(AVFilterContext*) * (graph->nb_filters + 1)); sizeof(*filters) * (graph->nb_filters + 1));
if (!filters) if (!filters)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment