[MPlayer-dev-eng] [PATCH] towards working shared libav* support

[Dominik 'Rathann' Mierzejewski]

On Sunday, 14 September 2008 at 16:41, Diego Biurrun wrote:
> On Sun, Sep 14, 2008 at 02:51:39AM +0200, Dominik 'Rathann' Mierzejewski wrote:
> > Here's the first patch that takes us a step close to working shared
> > libav* support. It doesn't break anything and fixes a couple of
> > problems when using ./configure --disable-libav*_a.
> 
> .. some comments below ..
> 
> > --- Makefile	(revision 27605)
> > +++ Makefile	(working copy)
> > @@ -752,7 +752,7 @@
> >  
> >  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
> > -	$(HOST_CC) -O -I. -DCODECS2HTML -o $@ $<
> > +	$(HOST_CC) -O -I. $(EXTRA_INC) -DCODECS2HTML -o $@ $<
> 
> Why?

cc -O -I. -DCODECS2HTML -o codec-cfg codec-cfg.c
In file included from codec-cfg.c:41:
libmpdemux/aviheader.h:7:30: error: libavutil/common.h: No such file or directory

That's why.

> > --- configure	(revision 27605)
> > +++ configure	(working copy)
> > @@ -6584,6 +6596,42 @@
> >  
> > +elif test "$_libswscale_so" = auto ; then
> > +  _libswscale_so=no
> > +  _res_comment="using libswscale.so, but static libswscale is recommended"
> > +  cat > $TMPC << EOF
> > +  #define CONFIG_LIBSWSCALE 1
> 
> This line is bogus I think.

Right. Bad copy&paste. libpostproc check needs fixing then.

> > --- libmpdemux/demux_lavf.c	(revision 27605)
> > +++ libmpdemux/demux_lavf.c	(working copy)
> > @@ -36,9 +36,7 @@
> >  
> >  #include "libavformat/avformat.h"
> >  #include "libavutil/avutil.h"
> > -#include "libavformat/avi.h"
> >  #include "libavcodec/opt.h"
> > -#include "libavformat/riff.h"
> 
> This looks unrelated.

Depends on how closely you understand "related", but the fact is demux_lavf
doesn't need those headers to compile. I can commit separately, no problem.

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