* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d': Bump major of libavfilter for reference counted buffer API changes. Conflicts: libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>