Merge commit '92db5083077a8b0f8e1050507671b456fd155125'

[android-x86/external-ffmpeg.git] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index a9502f6..5e03e6f 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,17 +1,29 @@
 NAME = swscale
-DESC = Libav image rescaling library
+DESC = FFmpeg image rescaling library
 
 HEADERS = swscale.h                                                     \
           version.h                                                     \
 
-OBJS = input.o                                                          \
-       options.o                                                        \
-       output.o                                                         \
-       rgb2rgb.o                                                        \
-       swscale.o                                                        \
-       swscale_unscaled.o                                               \
-       utils.o                                                          \
-       yuv2rgb.o                                                        \
+OBJS = alphablend.o                                     \
+       hscale.o                                         \
+       hscale_fast_bilinear.o                           \
+       gamma.o                                          \
+       input.o                                          \
+       options.o                                        \
+       output.o                                         \
+       rgb2rgb.o                                        \
+       slice.o                                          \
+       swscale.o                                        \
+       swscale_unscaled.o                               \
+       utils.o                                          \
+       yuv2rgb.o                                        \
+       vscale.o                                         \
+
+OBJS-$(CONFIG_SHARED)        += log2_tab.o
+
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES) += swscaleres.o
 
 TESTPROGS = colorspace                                                  \
+            pixdesc_query                                               \
             swscale                                                     \