[Ffmpeg-devel] Re: Fumble. please DO NOT commit anything right now

Guillaume POIRIER poirierg
Wed Dec 13 01:10:34 CET 2006


On 12/13/06, Edouard Gomez <ed.gomez at free.fr> wrote:
> On Wed, 13 Dec 2006 00:02:33 +0100, Guillaume POIRIER wrote:
> > Edouard, can you confirm that the correct version of your patches made
> > it through?
> Looks ok to me. Each patch has the right commit log and has no error in
> the patch itself.

That's what I thought too at first, because the first chuncks were Ok,
but not the next ones (hence the conflics).

I'll re-commit it properly by hand tomorrow.

(don't want to do the same mistake twice)

An association of men who will not quarrel with one another is a thing
which has never yet existed, from the greatest confederacy of nations
down to a town meeting or a vestry.
 -- Thomas Jefferson
(when interviewed about MPlayer ML flamewars)

More information about the ffmpeg-devel mailing list