github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2012-10-21	Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'	Michael Niedermayer
	* commit 'a7d2861d36756b913e85681b86ed3385274e8ced': svq3: K&R formatting cosmetics fate: Introduce ENCMUX macro for tests that require encoders and a muxer ffv1: Add missing #includes to header file Conflicts: libavcodec/ffv1.h libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-21	Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'	Michael Niedermayer
	* 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>
2012-10-21	Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'	Michael Niedermayer
	* 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>
2012-10-21	ffv1: split decoder and encoder	Michael Niedermayer
	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>
2012-10-20	ffv1: Add missing #includes to header file	Diego Biurrun

2012-10-20	ffv1: update to ffv1 version 3	Luca Barbato
	Based on code from Carl Eugen Hoyos, Michael Niedermayer and Paul B Mahol.
2012-10-20	ffv1: split decoder and encoder	Luca Barbato