diff --git a/configure.ac b/configure.ac
index c2e9aec06..7a87e2566 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1578,6 +1578,45 @@ if test $lavc_hwacc_vaapi_req = yes -a $lavc_hwacc_vaapi = no; then
 	AC_MSG_ERROR([Could not find hwacc vaapi dependencies!]);
 fi
 
+# -------------------------------------------------------------------------------------------------
+# Libswscale
+# -------------------------------------------------------------------------------------------------
+libswscale=no
+AC_ARG_ENABLE(libswscale,
+[  --disable-libswscale    disable libswscale support (default is auto)]
+[                          Requires: libswscale libavutil],
+[libswscale_req=$enableval],
+[libswscale_req=auto]
+)
+
+if test $system = Windows; then
+AC_CHECK_HEADERS([libswscale/swscale.h])
+AC_CHECK_LIB(swscale, sws_getContext)
+if test $ac_cv_header_libswscale_swscale_h = yes -a \
+        $ac_cv_lib_swscale_sws_getContext = yes
+then
+        found_libswscale=yes
+        LIBSWSCALE_LIBS="-lswscale"
+else
+        found_libswscale=no
+fi
+else # Linux, OS X
+PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [found_libswscale=yes], [found_libswscale=no])
+fi
+
+if test $libswscale_req != no -a $found_libswscale = yes
+then
+        AC_DEFINE([HAVE_SWSCALE], [1], [Build with Swscale support])
+
+        COMMON_FLAGS="$COMMON_FLAGS $LIBSWSCALE_CFLAGS"
+        libswscale=yes
+        #LIBSWSCALE_LIBS="$LIBSWSCALE_LIBS $LIBAVUTIL_LIBS" # added libavutil explicitly
+fi
+
+if test $libswscale_req = yes -a $libswscale = no; then
+        AC_MSG_ERROR([Libswscale not found]);
+fi
+
 # -------------------------------------------------------------------------------------------------
 # Libav
 # -------------------------------------------------------------------------------------------------
@@ -1626,7 +1665,7 @@ then
         COMMON_FLAGS="$COMMON_FLAGS $LIBAVCODEC_CFLAGS $LIBAVUTIL_CFLAGS"
         libavcodec=yes
         LIBAVCODEC_LIBS="$LIBAVCODEC_LIBS $LIBAVUTIL_LIBS" # added libavutil explicitly
-        ADD_MODULE("vcompress_libavcodec", "$LIBAVCODEC_COMPRESS_OBJ", "$LIBAVCODEC_LIBS")
+        ADD_MODULE("vcompress_libavcodec", "$LIBAVCODEC_COMPRESS_OBJ", "$LIBAVCODEC_LIBS $LIBSWSCALE_LIB")
         ADD_MODULE("vdecompress_libavcodec", "$LIBAVCODEC_DECOMPRESS_OBJ", "$LIBAVCODEC_LIBS")
         ADD_MODULE("acompress_libavcodec", "$LIBAVCODEC_AUDIO_CODEC_OBJ", "$LIBAVCODEC_LIBS")
 fi
@@ -1635,46 +1674,6 @@ if test $libavcodec_req = yes -a $libavcodec = no; then
         AC_MSG_ERROR([Libavcodec not found]);
 fi
 
-# -------------------------------------------------------------------------------------------------
-# Libswscale
-# -------------------------------------------------------------------------------------------------
-libswscale=no
-AC_ARG_ENABLE(libswscale,
-[  --disable-libswscale    disable libswscale support (default is auto)]
-[                          Requires: libswscale libavutil],
-[libswscale_req=$enableval],
-[libswscale_req=auto]
-)
-
-if test $system = Windows; then
-AC_CHECK_HEADERS([libswscale/swscale.h])
-AC_CHECK_LIB(swscale, sws_getContext)
-if test $ac_cv_header_libswscale_swscale_h = yes -a \
-        $ac_cv_lib_swscale_sws_getContext = yes
-then
-        found_libswscale=yes
-        LIBSWSCALE_LIBS="-lswscale"
-else
-        found_libswscale=no
-fi
-else # Linux, OS X
-PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [found_libswscale=yes], [found_libswscale=no])
-fi
-
-if test $libswscale_req != no -a $found_libswscale = yes
-then
-        AC_DEFINE([HAVE_SWSCALE], [1], [Build with Swscale support])
-
-        COMMON_FLAGS="$COMMON_FLAGS $LIBSWSCALE_CFLAGS"
-        libswscale=yes
-        #LIBSWSCALE_LIBS="$LIBSWSCALE_LIBS $LIBAVUTIL_LIBS" # added libavutil explicitly
-        LIBS="$LIBS $LIBSWSCALE_LIBS"
-fi
-
-if test $libswscale_req = yes -a $libswscale = no; then
-        AC_MSG_ERROR([Libswscale not found]);
-fi
-
 
 # -------------------------------------------------------------------------------------------------
 # OpenGL stuff