[MPlayer-dev-eng] [PATCH] loader fixes

[Dominik 'Rathann' Mierzejewski]

On Monday, 09 August 2004 at 10:11, Torinthiel wrote:
> On Sat, Jul 31, 2004 at 08:41:39PM +0200, Dominik 'Rathann' Mierzejewski
> wrote:
> > Hi.
> > A round of issues and proposed fixes. This is a follow-up for
> > http://mplayerhq.hu/pipermail/mplayer-dev-eng/2004-April/thread.html#25088
> > and
> > http://mplayerhq.hu/pipermail/mplayer-dev-eng/2004-April/thread.html#25156
> > and
> > http://mplayerhq.hu/pipermail/mplayer-dev-eng/2004-April/thread.html#25167
> > 
> > You're welcome to yell.
> [cut]
> 
> > Problem:
> > MPEGLAYER3WAVEFORMAT struct defined twice (in loader/wine/mmreg.h
> > and our libmpdemux/ms_hdr.h). It's part of Alex's somewhat failed
> > attempt
> > to implement my solution for platform-independent avi format
> > definitions.
> > 
> > Solution:
> > Surround both with:
> > #ifndef _MPEGLAYER3WAVEFORMAT_
> > #define _MPEGLAYER3WAVEFORMAT_
> > [...]
> > #endif /* _MPEGLAYER3WAVEFORMAT_ */
> 
> I have yelled at it on commit (at -cvslog), but got ignored. Hell, maybe
> because it was without a patch. But patch was on previous commit, that
> introduced double definition.

I remember it well. So maybe we should just apply it and wait for
the Cola shipment (if any). :)

R.

-- 
MPlayer RPMs maintainer: http://greysector.rangers.eu.org/mplayer/
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"