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