diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:09:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:09:37 +0100 |
| commit | ecade984ac3ce5205f6276a9329e2b7bca09fa47 (patch) | |
| tree | b3be8c61ad61a2ba7d12c028c48b561ae400f315 /libavfilter/graphparser.c | |
| parent | 8a0187e43d22527899a346034df4c7e4713f5212 (diff) | |
| parent | 42c7c61ab25809620b8c8809b3da73e25f5bbaaf (diff) | |
| download | ffmpeg-ecade984ac3ce5205f6276a9329e2b7bca09fa47.tar.gz | |
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/graphparser.c')
| -rw-r--r-- | libavfilter/graphparser.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index 3e85261c38..8d2fffc194 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -436,8 +436,8 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char *filters, return 0; fail:end: - for (; graph->filter_count > 0; graph->filter_count--) - avfilter_free(graph->filters[graph->filter_count - 1]); + for (; graph->nb_filters > 0; graph->nb_filters--) + avfilter_free(graph->filters[graph->nb_filters - 1]); av_freep(&graph->filters); avfilter_inout_free(&open_inputs); avfilter_inout_free(&open_outputs); @@ -504,8 +504,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, fail: if (ret < 0) { - for (; graph->filter_count > 0; graph->filter_count--) - avfilter_free(graph->filters[graph->filter_count - 1]); + for (; graph->nb_filters > 0; graph->nb_filters--) + avfilter_free(graph->filters[graph->nb_filters - 1]); av_freep(&graph->filters); } avfilter_inout_free(&inputs); @@ -591,8 +591,8 @@ end: avfilter_inout_free(&curr_inputs); if (ret < 0) { - for (; graph->filter_count > 0; graph->filter_count--) - avfilter_free(graph->filters[graph->filter_count - 1]); + for (; graph->nb_filters > 0; graph->nb_filters--) + avfilter_free(graph->filters[graph->nb_filters - 1]); av_freep(&graph->filters); } return ret; |