ffmpeg - Mirror of FFmpeg git repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'	Clément Bœsch	2016-06-21	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <[email protected]>
\| *	cosmetics: Fix spelling mistakes	Vittorio Giovara	2016-05-04	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Diego Biurrun <[email protected]>
* \|	Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'	Michael Niedermayer	2013-11-04	1	-4/+4
\|/ \| \| \| \| \| \| \| \| \| \|	* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb': lavc: split slice and frame threading functions into separate files Conflicts: libavcodec/Makefile libavcodec/pthread.c Merged-by: Michael Niedermayer <[email protected]>
*	lavc: split slice and frame threading functions into separate files	Anton Khirnov	2013-11-04	1	-0/+34