7 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0e09761686	Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced' ... * 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 17:01:01 +02:00
Michael Niedermayer	aa760b1735	Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd' ... * 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 16:13:55 +02:00
Michael Niedermayer	69fd0b7adb	Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129' ... * 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 14:37:15 +02:00
Michael Niedermayer	e4255eaf47	ffv1: split decoder and encoder ... 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-21 14:26:23 +02:00
Diego Biurrun	6cfca5b6ae	ffv1: Add missing #includes to header file	2012-10-20 21:10:21 +02:00
Luca Barbato	0f13cd3187	ffv1: update to ffv1 version 3 ... Based on code from Carl Eugen Hoyos, Michael Niedermayer and Paul B Mahol.	2012-10-20 18:14:52 +02:00
Luca Barbato	71f7b22dba	ffv1: split decoder and encoder	2012-10-20 18:14:43 +02:00