Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 12:49:25 +0000 (14:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 12:49:30 +0000 (14:49 +0200)
commitf4db6bfeb86feda2aeb98072e55b55de85ba0962
treec18b40f04e4fc7d57650d175e521b15669297805
parent16fc24b240cafc37cd1ea402e9ab2b4cd5ba6269
parent7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa
Merge commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa'

* commit '7e8fe4be5fb4c98aa3c6a4ed3cec999f4e3cc3aa':
  lavfi: add a function for counting elements in AVFilterPad arrays.

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