Browse Source

Merge commit '9676b9a2cdc4a90611188fc48d8d388e427997c5'

* commit '9676b9a2cdc4a90611188fc48d8d388e427997c5':
  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: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 13 years ago
parent
commit
b64077bebe
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavfilter/avfiltergraph.c

+ 2
- 2
libavfilter/avfiltergraph.c View File

@@ -51,7 +51,7 @@ static const AVClass filtergraph_class = {

AVFilterGraph *avfilter_graph_alloc(void)
{
AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph));
AVFilterGraph *ret = av_mallocz(sizeof(*ret));
if (!ret)
return NULL;
ret->av_class = &filtergraph_class;
@@ -75,7 +75,7 @@ void avfilter_graph_free(AVFilterGraph **graph)
int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
{
AVFilterContext **filters = av_realloc(graph->filters,
sizeof(AVFilterContext*) * (graph->nb_filters + 1));
sizeof(*filters) * (graph->nb_filters + 1));
if (!filters)
return AVERROR(ENOMEM);



Loading…
Cancel
Save