diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:27:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:28:27 +0100 |
| commit | b64077bebe1f29adb2e72af1d9382c35f73ae651 (patch) | |
| tree | 75c6d89b265b4fec8d9b3c121cdcc1f7b9dd91e0 /libavfilter/avfiltergraph.c | |
| parent | e1b1092755ba77b93a2f9b742d2fd92f69b746af (diff) | |
| parent | 9676b9a2cdc4a90611188fc48d8d388e427997c5 (diff) | |
| download | ffmpeg-b64077bebe1f29adb2e72af1d9382c35f73ae651.tar.gz | |
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>
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 9b05c6d6d1..89cdda33dd 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -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); |