-
Michael Niedermayer authored
* commit '45dd1ae1': avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs Conflicts: libavfilter/buffer.c libavfilter/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
0c8efe48
* commit '45dd1ae1': avfilter: Add some missing FF_API_AVFILTERBUFFER ifdefs Conflicts: libavfilter/buffer.c libavfilter/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>