@@ -66,7 +66,7 @@ SRCS = $(addsuffix .c, $(PROGS-yes)) cmdutils.c

 LDFLAGS := -L$(BUILD_ROOT)/libavdevice -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil $(LDFLAGS)

 EXTRALIBS := -lavdevice$(BUILDSUF) -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)

-ifeq ($(CONFIG_SWSCALER),yes)

+ifeq ($(CONFIG_SWSCALE),yes)

 LDFLAGS+=-L$(BUILD_ROOT)/libswscale

 EXTRALIBS+=-lswscale$(BUILDSUF)

 endif

@@ -87,7 +87,7 @@ lib:

 	$(MAKE)                    -C libavformat all

 	$(MAKE)                    -C libavdevice all

 	$(MAKE-$(CONFIG_POSTPROC)) -C libpostproc all

-	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  all

+	$(MAKE-$(CONFIG_SWSCALE))  -C libswscale  all

 	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all

 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs

@@ -173,7 +173,7 @@ install-libs:

 	$(MAKE)                    -C libavformat install-libs

 	$(MAKE)                    -C libavdevice install-libs

 	$(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-libs

-	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  install-libs

+	$(MAKE-$(CONFIG_SWSCALE))  -C libswscale  install-libs

 	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-libs

 install-headers:

@@ -222,7 +222,7 @@ depend dep: .depend .vhookdep

 	$(MAKE)                    -C libavformat depend

 	$(MAKE)                    -C libavdevice depend

 	$(MAKE-$(CONFIG_POSTPROC)) -C libpostproc depend

-	$(MAKE-$(CONFIG_SWSCALER)) -C libswscale  depend

+	$(MAKE-$(CONFIG_SWSCALE))  -C libswscale  depend

 	$(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend

 .depend: $(SRCS) version.h

@@ -409,11 +409,11 @@ test-server: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw

 	@echo

 	$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf

-ifeq ($(CONFIG_SWSCALER),yes)

+ifeq ($(CONFIG_SWSCALE),yes)

 test-server codectest $(CODEC_TESTS) libavtest: swscale_error

 swscale_error:

 	@echo

-	@echo "This regression test is incompatible with --enable-swscaler."

+	@echo "This regression test is incompatible with --enable-swscale."

 	@echo

 	@exit 1

 endif

@@ -71,7 +71,7 @@ show_help(){

   echo "  --enable-nonfree         allow use of nonfree code, the resulting libav*"

   echo "                           and ffmpeg will be unredistributable [default=no]"

   echo "  --enable-postproc        enable GPLed postprocessing support [default=no]"

-  echo "  --enable-swscaler        software scaler support [default=no]"

+  echo "  --enable-swscale         software scaler support [default=no]"

   echo "  --enable-avfilter        video filter support (replaces vhook) [default=no]"

   echo "  --enable-avfilter-lavf   video filters dependant on avformat [default=no]"

   echo "  --enable-beosthreads     use BeOS threads [default=no]"

@@ -661,7 +661,7 @@ CONFIG_LIST="

     postproc

     powerpc_perf

     small

-    swscaler

+    swscale

     vhook

     x11grab

     zlib

@@ -1214,7 +1214,7 @@ case $targetos in

         shlibdir="$bindir"

         VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'

         VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'

-        if enabled swscaler; then

+        if enabled swscale; then

             VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"

             VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"

         fi

@@ -1234,7 +1234,7 @@ case $targetos in

         shlibdir="$bindir"

         VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'

         VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'

-        if enabled swscaler; then

+        if enabled swscale; then

             VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"

             VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"

         fi

@@ -1355,7 +1355,7 @@ if ! enabled gpl; then

     die_gpl_disabled "libxvidcore"             libxvid

     die_gpl_disabled "FAAD2"                   libfaad2

     die_gpl_disabled "The X11 grabber"         x11grab

-    die_gpl_disabled "The software scaler"     swscaler

+    die_gpl_disabled "The software scaler"     swscale

 fi

 if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then

@@ -1898,7 +1898,7 @@ echo "optimizations             ${optimizations-no}"

 echo "static                    ${static-no}"

 echo "shared                    ${shared-no}"

 echo "postprocessing support    ${postproc-no}"

-echo "software scaler enabled   ${swscaler-no}"

+echo "software scaler enabled   ${swscale-no}"

 echo "new filter support        ${avfilter-no}"

 echo "filters using lavformat   ${avfilter_lavf-no}"

 echo "video hooking             ${vhook-no}"

@@ -2184,7 +2184,7 @@ if enabled postproc; then

     pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"

 fi

-if enabled swscaler; then

+if enabled swscale; then

     pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" -lswscale "libavutil = $LIBAVUTIL_VERSION"

     pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"

 else

@@ -356,7 +356,7 @@ OBJS-$(HAVE_W32THREADS)                += w32thread.o

 OBJS-$(HAVE_XVMC_ACCEL)                += xvmcvideo.o

-ifneq ($(CONFIG_SWSCALER),yes)

+ifneq ($(CONFIG_SWSCALE),yes)

 OBJS += imgresample.o

 endif

@@ -2380,7 +2380,7 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width,

 }

 #endif

-#ifndef CONFIG_SWSCALER

+#ifndef CONFIG_SWSCALE

 /* XXX: always use linesize. Return -1 if not supported */

 int img_convert(AVPicture *dst, int dst_pix_fmt,

                 const AVPicture *src, int src_pix_fmt,

@@ -2,7 +2,7 @@ include ../config.mak

 NAME = avfilter

 FFLIBS = avcodec avutil

-FFLIBS-$(CONFIG_SWSCALER)      += swscale

+FFLIBS-$(CONFIG_SWSCALE)       += swscale

 FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat

 OBJS = allfilters.o \