[MPlayer-dev-eng] [PATCH] config.h from MPlayer clashes with config.h from x264

Diego Biurrun diego at biurrun.de
Wed Aug 16 14:45:12 CEST 2006


On Tue, Aug 15, 2006 at 12:22:11PM +0700, Vladislav Naumov wrote:
> On 8/15/06, Jan Knutar <jknutar at nic.fi> wrote:
> >On Monday 14 August 2006 12:26, Vladislav Naumov wrote:
> >
> >> Patch I've attached puts $(OPTFLAGS) after '-I..'.
> >
> >The patch doesn't modify libavformat/ and friends, so the compile
> Yuck!
> Missed those externals completely.
> Here's a patch for it (previous patch not included, apply both).

The other patch does not cover all directories, it should at least be
consistent everywhere.  This one does not include vhook.

> >still fails, and it might be a bit troublesome to get these kind of changes
> >into ffmpeg just to fix MPlayer...
> Maybe.
> Anyway, either we push those changes everywhere, sorting include dirs
> properly, or we make every .h completely distinguishable
> (mplayer_config.h, x264_config.h, etc).
> 
> Renaming files seems like a "cleaner" solution to me, but needs more
> work (71 trivial change in mplayer tree, grep says).

I'm not so sure if renaming is the better way, but choosing config.h as
a name is not a good idea, that should be clear by now.

Diego



More information about the MPlayer-dev-eng mailing list