* commit 'b01f6041':
  lavfi: rename AVFilterFormats.format_count to nb_formats

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/filtfmts.c
	libavfilter/formats.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>