Merge commit '7046bd9b'
* commit '7046bd9b': lavfi: Move avcodec header to the only filter needing it Conflicts: libavfilter/avfilter.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please register or sign in to comment
* commit '7046bd9b': lavfi: Move avcodec header to the only filter needing it Conflicts: libavfilter/avfilter.h Merged-by:Michael Niedermayer <michaelni@gmx.at>