[FFmpeg-cvslog] Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 16 16:09:37 2013 +0100| [ecade984ac3ce5205f6276a9329e2b7bca09fa47] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecade984ac3ce5205f6276a9329e2b7bca09fa47
---