[MPlayer-cvslog] r26062 - in trunk/vidix: AsmMacros.h cyberblade_regs.h dha.h dhahelperwin/dhahelper.h dhahelperwin/ntverp.h drivers.h fourcc.h glint_regs.h kernelhelper/dhahelper.h mach64.h pm3_regs.h radeon.h savage_regs.h sis_defs.h sis_regs.h sysdep/AsmMacros_alpha.h sysdep/AsmMacros_arm32.h sysdep/AsmMacros_ia64.h sysdep/AsmMacros_powerpc.h sysdep/AsmMacros_sparc.h sysdep/AsmMacros_x86.h unichrome_regs.h vidix.h vidixlib.h

[Benjamin Zores]

Reimar Döffinger a écrit :
> On Fri, Feb 22, 2008 at 06:32:36PM +0100, diego wrote:
>> Author: diego
>> Date: Fri Feb 22 18:32:36 2008
>> New Revision: 26062
>>
>> Log:
>> Add MPLAYER_ prefix to multiple inclusion guards.
>>
>>
>> Modified:
>>    trunk/vidix/AsmMacros.h
>>    trunk/vidix/cyberblade_regs.h
> 
> So, does this mean that after a short period (involving lots of work and
> quite a few breakages) of syncing against upstream we are now again
> introducing our own changes in vidix, so it won't be too easy the next
> time we turn around again and decide to sync it to upstream again or
> what?!?

MPlayer's vidix and vidix.sf.net never were synchronized in the mean you 
understand it.
I've changed a bit MPlayer vidix API to have a static vidix that Nick 
always refused to do.
I regularly adapt/put any patch that is commited to vidix.sf.net but 
there's no chance we will ever import it again.

Ben