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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/graph2dot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/graph2dot.c b/tools/graph2dot.c index 74075c7af2..d53642f915 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -58,7 +58,7 @@ static void print_digraph(FILE *outfile, AVFilterGraph *graph) fprintf(outfile, "node [shape=box]\n"); fprintf(outfile, "rankdir=LR\n"); - for (i = 0; i < graph->filter_count; i++) { + for (i = 0; i < graph->nb_filters; i++) { char filter_ctx_label[128]; const AVFilterContext *filter_ctx = graph->filters[i]; |