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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'	Derek Buitenhuis	2016-04-17	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950': intrax8: K&R formatting cosmetics Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
\| *	intrax8: K&R formatting cosmetics	Vittorio Giovara	2016-03-22	1	-2/+2
\| \|
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2012-09-03	1	-0/+2
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qatar/master: build: avcodec: order cosmetics intrax8dsp: Add missing #include to make header standalone Delete motion-test tool; it is of doubtful utility. Conflicts: libavcodec/Makefile libavcodec/motion-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	intrax8dsp: Add missing #include to make header standalone	Diego Biurrun	2012-09-03	1	-0/+2
\| \|
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2012-09-02	1	-4/+4
\|/ \| \| \| \| \| \|	* qatar/master: intrax8: move functions from dsputil to own context Merged-by: Michael Niedermayer <michaelni@gmx.at>
*	intrax8: move functions from dsputil to own context	Mans Rullgard	2012-09-02	1	-0/+33
	Signed-off-by: Mans Rullgard <mans@mansr.com>