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

Edouard Gomez ed.gomez
Wed Dec 13 01:31:02 CET 2006


On Wed, 13 Dec 2006 00:23:58 +0000, Edouard Gomez wrote:

> On Wed, 13 Dec 2006 01:15:06 +0100, Diego Biurrun wrote:
>> WTF?  You committed patches that applied with rejects?
> 
> No the patches applied cleanly, i swear. Something went wrong.
>

I tried with the commit before the first X11 commit in SVN, here is the
output of the applyer script (just removed the svn commit call):

---------------------------------8<---------------------
Applying feature-x11grab.patch
=========================
patching file configure
Hunk #1 succeeded at 1659 (offset 15 lines).
patching file ffmpeg.c
patching file libavformat/Makefile
patching file libavformat/allformats.c
patching file libavformat/allformats.h
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-1.patch
=========================
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-2.patch
=========================
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-3.patch
=========================
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-4.patch
=========================
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-5.patch
=========================
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-6.patch
=========================
patching file libavformat/x11grab.c


Applying feature-x11grab-improvement-7.patch
=========================
patching file libavformat/x11grab.c
---------------------------------8<---------------------

So something went wrong on Guillaume's box during the run... but his
output doesn't give any clue why there are rejects.

-- 
Edouard Gomez





More information about the ffmpeg-devel mailing list