libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'	Michael Niedermayer	2012-10-21
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd': doc/platform: Add info on shared builds with MSVC doc/platform: Move a caveat down to the notes section ARM: reinstate optimised intmath.h ffv1: update to ffv1 version 3 Conflicts: doc/platform.texi libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	ffv1: update to ffv1 version 3	Luca Barbato	2012-10-20
\| \| \| \| \| \| \| \|	Based on code from Carl Eugen Hoyos, Michael Niedermayer and Paul B Mahol.
* \|	Merge commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f'	Michael Niedermayer	2012-10-21
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '4a2a4524a3f50ed302820ba971ddd48e78c7436f': ffv1: propagate errors Conflicts: libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	ffv1: propagate errors	Luca Barbato	2012-10-20
\| \|
* \|	Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'	Michael Niedermayer	2012-10-21
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '71f7b22dba60524b2285643ae0b49d8f64977129': ffv1: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	ffv1: split decoder and encoder	Luca Barbato	2012-10-20
\|
*	ffv1: split decoder and encoder	Michael Niedermayer	2012-10-21
	This is not based on lucas work due to code divergence (its less work this way than trying to merge from a split based on 2 years outdated code) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>