[Ffmpeg-devel] [RFC, PATCH] import libswscale

[Diego Biurrun]

On Tue, Mar 21, 2006 at 12:17:23PM +0100, Luca Abeni wrote:
> 
> Comments are welcome. If you think I did something in the wrong way, let
> me know and I'll try to redo this work properly.
>  
> --- ffmpeg.orig/Makefile	2006-03-21 08:42:43.346751688 +0100
> +++ ffmpeg/Makefile	2006-03-21 10:02:54.960275248 +0100
> @@ -188,6 +198,7 @@
>  	$(MAKE) -C libavcodec  distclean
>  	$(MAKE) -C libavformat distclean
>  	$(MAKE) -C libavcodec/libpostproc distclean
> +	$(MAKE) -C libswscale distclean

Nit: Please add one more space to make the columns align :)

> --- ffmpeg.orig/configure	2006-03-21 09:55:42.086082128 +0100
> +++ ffmpeg/configure	2006-03-21 10:02:54.961275096 +0100
> @@ -44,6 +44,7 @@
>  echo "  --enable-pthreads        use pthreads [default=no]"
>  echo "  --enable-dc1394          enable IIDC-1394 grabbing using libdc1394"
>  echo "                           and libraw1394 [default=no]"
> +echo "  --enable-swscaler        swscaler support [default=no]"

I'd prefer if you called this "software scaler" instead of swscaler.
The names in the description should be - ummm - descriptive.

> @@ -711,6 +715,10 @@
>          fi
>      fi
>  
> +    if test "$swscaler" != "no"; then
> +        echo "SwScaler is under GPL and --enable-gpl is not specified"

Nit: Add a period to the end of this sentence.

> @@ -2092,3 +2107,34 @@
> +Name: libswscale
> +Description: FFmpeg image rescaling library
> +Version: $lavc_version

Hmmm, I think libswscale should have a separate version number, just
like all the other components (libavcodec, libavformat, libpostproc).

> --- ffmpeg.orig/libavcodec/Makefile	2006-03-21 09:55:42.086082128 +0100
> +++ ffmpeg/libavcodec/Makefile	2006-03-21 10:02:54.961275096 +0100
> @@ -6,11 +6,14 @@
>  
>  # NOTE: -I.. is needed to include config.h
>  CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)
> +ifeq ($(CONFIG_SWSCALER),yes)
> +CFLAGS+=-I$(SRC_PATH)/libswscale
> +endif

OK, this is (part of) the circular dependency on libavcodec that we
already talked about.  You said you would address it later...

Rest looks OK, make the small changes I requested and the build system
part has my blessing.

Diego