Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:09:37 +0000 (16:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:09:37 +0000 (16:09 +0100)
commitecade984ac3ce5205f6276a9329e2b7bca09fa47
treeb3be8c61ad61a2ba7d12c028c48b561ae400f315
parent8a0187e43d22527899a346034df4c7e4713f5212
parent42c7c61ab25809620b8c8809b3da73e25f5bbaaf
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>
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphdump.c
libavfilter/graphparser.c
libavfilter/version.h
tools/graph2dot.c