-
Michael Niedermayer authored
* commit '7046bd9b': lavfi: Move avcodec header to the only filter needing it Conflicts: libavfilter/avfilter.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
6b783d2a
* commit '7046bd9b': lavfi: Move avcodec header to the only filter needing it Conflicts: libavfilter/avfilter.h Merged-by: Michael Niedermayer <michaelni@gmx.at>