History

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)

Michael Niedermayer committed 13 years ago

Commit b64077b2 parents e1b1092 9676b9a1 file · +2 −2Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 1 file). Show all

Unified · Split

libavfilter/avfiltergraph.c+2−2
@@ -51,7 +51,7 @@ static const AVClass filtergraph_class = { · 50 unmodified lines
51 51
52AVFilterGraph *avfilter_graph_alloc(void)52AVFilterGraph *avfilter_graph_alloc(void)
53{53{
54 AVFilterGraph *ret = av_mallocz(sizeof(AVFilterGraph));54 AVFilterGraph *ret = av_mallocz(sizeof(*ret));
55 if (!ret)55 if (!ret)
56 return NULL;56 return NULL;
57 ret->av_class = &filtergraph_class;57 ret->av_class = &filtergraph_class;
@@ -75,7 +75,7 @@ void avfilter_graph_free(AVFilterGraph **graph) · 17 unmodified lines
75int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)75int avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter)
76{76{
77 AVFilterContext **filters = av_realloc(graph->filters,77 AVFilterContext **filters = av_realloc(graph->filters,
78 sizeof(AVFilterContext*) * (graph->nb_filters + 1));78 sizeof(*filters) * (graph->nb_filters + 1));
79 if (!filters)79 if (!filters)
80 return AVERROR(ENOMEM);80 return AVERROR(ENOMEM);
81 81

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t