delta/ffmpeg.git - git.ffmpeg.org: ffmpeg.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '29c2d06d67724e994980045afa055c6c34611b30'	Derek Buitenhuis	2016-02-24	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '29c2d06d67724e994980045afa055c6c34611b30': cosmetics: Drop empty comment lines Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
\| *	cosmetics: Drop empty comment lines	Diego Biurrun	2016-02-18	1	-1/+0
\| \|
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2013-09-28	1	-2/+0
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: lavfi: allow user-provided execute() callbacks Conflicts: libavfilter/avfilter.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	lavfi: allow user-provided execute() callbacks	Anton Khirnov	2013-09-28	1	-2/+0
\| \|
* \|	Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'	Michael Niedermayer	2013-05-24	1	-4/+4
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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>
*	lavfi: add a slice threading infrastructure	Anton Khirnov	2013-05-24	1	-0/+31
	Mostly based on libavcodec's