2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	8d4e969afe	Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f' ... * commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f': lavfi: add a slice threading infrastructure Conflicts: Changelog cmdutils.c doc/APIchanges libavfilter/Makefile libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/internal.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-05-24 14:07:00 +02:00
Anton Khirnov	129bb23843	lavfi: add a slice threading infrastructure ... Mostly based on libavcodec's	2013-05-24 09:28:18 +02:00