Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 12:30:29 +0000 (14:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 12:30:34 +0000 (14:30 +0200)
commit16fc24b240cafc37cd1ea402e9ab2b4cd5ba6269
tree52a05d82a06726683e0c993f78d9774ec1d3a83a
parent46de9ba5981531dcbfe05943448bebc5569fb3df
parent7cdd737ba81b5c2c9521c4509edf0ac315fabc65
Merge commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65'

* commit '7cdd737ba81b5c2c9521c4509edf0ac315fabc65':
  lavfi: mark filters with dynamic number of inputs or outputs with special flags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavfilter/af_amix.c
libavfilter/af_channelsplit.c
libavfilter/af_join.c
libavfilter/avfilter.h
libavfilter/split.c