[MPlayer-dev-eng] [RFC] towards working shared libav* support, part 2

[Dominik 'Rathann' Mierzejewski]

On Sunday, 14 September 2008 at 11:29, Reimar Döffinger wrote:
> On Sun, Sep 14, 2008 at 03:51:48AM +0200, Dominik 'Rathann' Mierzejewski wrote:
> > Additionally, it needs
> > svn cp ffmpeg/libavutil/bswap.h mplayer/osdep/bswap.h
> > svn cp ffmpeg/libavutil/intreadwrite.h mplayer/osdep/intreadwrite.h
> > (with minor adjustments, skipped for now)
> 
> I have quite a problem with that. That is exactly the kind of code I
> really would _not_ want to have duplicated, and doubly not with the same
> file name, IMO that kind of thing caused enough issues in the past (even
> though the make system has improved so it is less of an issue).

Well, I went the easy way. As I said, this is only proof-of-concept.
Måns said the inclusion of bswap.h and intreadwrite.h is invalid and should
be fixed in MPlayer. If you have a suggestion on how to solve it without
duplicating those files in MPlayer, I'm all ears.

> > Index: mpintrw.h
> > ===================================================================
> > --- mpintrw.h	(revision 0)
> > +++ mpintrw.h	(revision 0)
> > @@ -0,0 +1,11 @@
> > +#ifndef MPLAYER_MPINTRW_H
> > +#define MPLAYER_MPINTRW_H
> > +
> > +#include "config.h"
> > +#ifdef CONFIG_LIBAVUTIL_A
> > +#include "avutil/intreadwrite.h"
> 
> Huh? did you test that?

Argh, wrong patch. That's what I get for late-night hacking.

> > +#else
> > +#include "osdep/intreadwrite.h"
> > +#endif
> > +
> > +#endif /* MPLAYER_MPINTRW_H */
> 
> And since it is a wrapper for intreadwrite.h it should be called
> mpintreadwrite.h, not mpintrw.h - if the name seems too verbose
> to you, FFmpeg is the place to get it changed IMHO.

No problem with calling it mpintreadwrite.h. There are bigger issues than
naming right now. ;)

Regards,
R.

-- 
MPlayer http://mplayerhq.hu | Livna http://rpm.livna.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan