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
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
4a2a4524a3
ffv1: propagate errors
2012-10-20 18:14:51 +02:00
Luca Barbato
71f7b22dba
ffv1: split decoder and encoder
2012-10-20 18:14:43 +02:00
