[Ffmpeg-devel] swscale.h in libavcodec and libswscale

Diego Biurrun diego
Fri Oct 20 00:12:07 CEST 2006


On Tue, Oct 17, 2006 at 02:19:22PM +0200, Luca Abeni wrote:
> 
> On Mon, 2006-10-16 at 15:41 +0200, Luca Abeni wrote:
> [...]
> > > > In my opinion, this is not a problem: unless I am missing something, the
> > > > correct swscale.h is always included, and "make install" installs the
> > > > correct file. Of course, I might be wrong... Let me know, and I'll fix
> > > > the problem.
> > > 
> > > Yes, it works.  It's just the ugliness resulting from having two largely
> > > redundant subsystems ..
> > I see... And I agree.
> Ok... Since I said that I agree, I decided to have a better look at this
> problem. The attached patch shows how libavcodec/swscale.h can be
> removed, using libswscale/swscale.h instead.
> 
> I think I did not initially like this solution because a file from
> libscale is included when compiling libavcodec (note that libswscale is
> always added to the include path).
> 
> The attached patch is still not perfect (I think "make install" will not
> work), but if you think that something like this should be committed
> I'll prepare a correct and more tested version.
> 
> --- libavcodec/Makefile	(revision 6713)
> +++ libavcodec/Makefile	(working copy)
> @@ -4,6 +4,7 @@
>  #
>  include ../config.mak
>  
> +CFLAGS+=-I$(SRC_PATH)/libswscale
>  CFLAGS+=$(AMR_CFLAGS)

CFLAGS+=-I$(SRC_PATH)/libswscale $(AMR_CFLAGS)

Apart from that the patch looks fine to me.

Diego




More information about the ffmpeg-devel mailing list