Context Navigation

Changes between Version 1 and Version 2 of LibavMerge

v1	v2
22	22
23	23	- It causes a non negligible merge commits pollution. We make sure there are not several level of merges entangled (we do a 1:1 merge/commit), but it's still a non-linear history.
24		- Many duplicated work. For instance, we added libavresample in our tree to keep compatibility with Libav when our libswresample was already covering the exact same purpose. The same thing happened for various elements such as the ProRes support (but differences in features, bugs, licenses, ...). There are many work to do to unify them, and any help is very much welcome.
	24	- Many duplicated work. For instance, we added libavresample in our tree to keep compatibility with Libav when our libswresample was already covering the exact same purpose. The same thing happened for various elements such as the !ProRes support (but differences in features, bugs, licenses, ...). There are many work to do to unify them, and any help is very much welcome.
25	25	- So much manpower from both FFmpeg and Libav is lost because of this mess. We know it, and we don't know how to fix it. It takes incredible time to do these merges, so we have even less time to work on things we personally care about. The bad vibes also do not help with keeping our developers motivated.
26	26	- There is a growing technical risk factor with the merges due to the codebase differing more and more.