-
Michael Niedermayer authored
* commit '8114c101': lavfi: add avfilter_get_class(). Conflicts: libavfilter/avfilter.h Merged-by:
Michael Niedermayer <michaelni@gmx.at>
44d44883
* commit '8114c101': lavfi: add avfilter_get_class(). Conflicts: libavfilter/avfilter.h Merged-by:Michael Niedermayer <michaelni@gmx.at>