avcodec: for audio encoding, reset output packet when it is not valid

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 2d90fa7e5a930f1407165a53337f9a2326eea73b..349dd99789b546e81b764795b0f32170066516c4 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,27 +1,16 @@
-
-include ../config.mak
-
 NAME = swscale
 FFLIBS = avutil
 
-OBJS = rgb2rgb.o swscale.o
-
-OBJS-$(CONFIG_GPL)         +=  yuv2rgb.o
-OBJS-$(HAVE_ALTIVEC)       +=  yuv2rgb_altivec.o
-
-OBJS-$(ARCH_BFIN)          +=  swscale_bfin.o \
-                               yuv2rgb_bfin.o \
-
-ASM_OBJS-$(ARCH_BFIN)      += internal_bfin.o
-
-HEADERS = swscale.h rgb2rgb.h
-
-include ../common.mak
-
-cs_test: cs_test.o $(LIBNAME)
+HEADERS = swscale.h
 
-swscale-example: swscale-example.o $(LIBNAME)
-swscale-example: EXTRALIBS += -lm
+OBJS = input.o                                          \
+       options.o                                        \
+       output.o                                         \
+       rgb2rgb.o                                        \
+       swscale.o                                        \
+       swscale_unscaled.o                               \
+       utils.o                                          \
+       yuv2rgb.o                                        \
 
-clean::
-       rm -f cs_test swscale-example
+TESTPROGS = colorspace                                                  \
+            swscale                                                     \