ffmpeg - Mirror of FFmpeg git repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'	Michael Niedermayer	2015-06-21	1	-1/+1
\|\
\| *	af_resample: Set the number of samples in the last frame	Luca Barbato	2015-06-20	1	-1/+1
* \|	Merge commit '13164e479f1c87829096c19003d2cc658ccc1fd4'	Michael Niedermayer	2014-04-13	1	-0/+14
\|\\|
\| *	FATE: add tests for more resampling modes	Anton Khirnov	2014-04-13	1	-0/+14
* \|	Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'	Michael Niedermayer	2014-04-13	1	-1/+1
\|\\|
\| *	resample: implement flushing	Anton Khirnov	2014-04-13	1	-1/+1
* \|	Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'	Michael Niedermayer	2014-01-04	1	-0/+7
\|\\|
\| *	FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c245...	Anton Khirnov	2014-01-03	1	-0/+7
* \|	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer	2013-10-17	1	-1/+1
\|\\|
\| *	fate: Increase the tolerance in the lavr tests	Martin Storsjö	2013-10-17	1	-1/+1
* \|	Merge commit '68edd5be0980941924ae633d98589d56a8091bbd'	Michael Niedermayer	2013-10-16	1	-5/+7
\|\\|
\| *	FATE: use proper comparison mode in the lavr tests	Anton Khirnov	2013-10-15	1	-5/+7
* \|	Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'	Michael Niedermayer	2013-10-13	1	-0/+19
\|\\|
\| *	FATE: add lavr resampling tests	Anton Khirnov	2013-10-12	1	-0/+19
* \|	Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'	Michael Niedermayer	2013-10-13	1	-2/+2
\|/
*	FATE: add lavr mixing tests	Anton Khirnov	2013-10-12	1	-0/+26