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-08 11:22:42 +02:00
2013-02-17 17:36:27 +01:00
2012-01-28 11:04:19 +01:00
2012-12-15 11:46:47 +01:00
2013-01-21 10:24:45 +00:00
2013-01-06 16:30:02 +01:00
2013-02-13 18:41:37 -05:00
2012-12-21 00:18:34 +01:00
2013-01-06 16:30:02 +01:00
2013-02-14 23:45:48 +01:00
2012-12-21 00:18:34 +01:00