[MPlayer-cvslog] r27301 - in trunk/libmpdemux: demux_asf.c demux_real.c demux_viv.c demuxer.h video.c

[Reimar Döffinger]

On Wed, Jul 16, 2008 at 08:05:43PM +0300, Uoti Urpala wrote:
> On Wed, 2008-07-16 at 18:18 +0200, reimar wrote:
> > --- trunk/libmpdemux/demuxer.h	(original)
> > +++ trunk/libmpdemux/demuxer.h	Wed Jul 16 18:18:25 2008
> > @@ -93,6 +93,12 @@
> >  #define SEEK_ABSOLUTE (1 << 0)
> >  #define SEEK_FACTOR   (1 << 1)
> >  
> > +#ifdef USE_LIBAVCODEC
> > +#include "libavcodec/avcodec.h"
> 
> Diego thought about doing something like this a year ago, but it wasn't
> done because demuxer.h is included in so many files.
> 
> http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-July/052886.html
> 
> $ find . -name '*.d' -print0 | xargs -0 grep demuxer.h | wc -l
> 116
> 
> IMO the same reasons still apply. A 3k line header shouldn't be included
> in that many files because a couple of them need a definition from it.

Well, actually demuxer.h is one of the files that need the define.
I do not like it either, but I simply do not feel convinced that the way
it was before wasn't quite horrible, too.
I guess a proper solution would be to move the demux_new_packet in a
special file and add padded malloc/realloc functions, but seems like too
much work to me currently.