Michael Niedermayer ecade984ac 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>
2013-03-16 16:09:37 +01:00
..
2012-10-26 18:24:50 +02:00
2013-03-07 01:12:04 +01:00
2012-10-24 22:25:43 +02:00
2013-01-15 22:50:19 +01:00
2013-02-24 13:12:46 +01:00
2012-10-13 20:35:56 +02:00
2012-09-15 15:40:36 -04:00