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-06-22 17:15:36 +01:00
2012-07-24 01:24:23 +02:00
2012-12-09 18:50:38 +01:00
2012-10-26 18:24:50 +02:00
2013-03-07 01:12:04 +01:00
2012-10-16 13:51:44 +02:00
2012-10-24 22:25:43 +02:00
2013-03-16 16:09:37 +01:00
2013-03-14 12:15:02 +01:00
2012-08-28 15:18:27 +02:00
2012-08-13 10:44:59 +02:00
2013-01-23 17:44:56 +01:00
2012-10-01 16:12:38 +02:00
2013-01-15 22:50:19 +01:00
2012-10-31 13:16:52 +01:00
2012-12-13 15:07:20 +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