[x264-devel] commit: fix linking issue with the CLI (Guillaume Poirier )

[Jason Garrett-Glaser]

On Sun, Jan 31, 2010 at 6:05 AM, Guillaume POIRIER
<gpoirier at mplayerhq.hu> wrote:
> On Sat, Jan 30, 2010 at 4:13 PM, avcoder <ffmpeg at gmail.com> wrote:
>> Dear:
>> it seems that this version is wrong because input/thread.c will be added
>> twice by following rule:
>> ifneq ($(findstring HAVE_PTHREAD, $(CONFIG)),)
>> SRCCLI += input/thread.c
>> endif
>
> I guess you're right. I hard some other local changes the caused a
> problem I was solving with that patch. :-(
>
> I'm going to revert it.
>
> Guillaume

Please stop doing broken server-side merges!  This is the second time
we've had to revert your commits!  Please discuss on IRC before making
undiscussed changes.

Dark Shikari