matroskadec: set duration only for CODEC_ID_TEXT subtitles

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 213f1846a0a2e95cd83b933e28256b0e9b12dbdc..0b1d2da21774921966508b0f75a6162152ed97b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,8 @@ tools/%$(EXESUF): tools/%.c
 
 ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 
+alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher))
+
 VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
 
 BASEHOOKS = fish null watermark
@@ -212,6 +214,7 @@ CODEC_TESTS = $(addprefix regtest-,             \
         adpcm_swf                               \
         flac                                    \
         wma                                     \
+        pcm                                     \
     )
 
 LAVF_TESTS = $(addprefix regtest-,              \
@@ -262,11 +265,11 @@ LAVF_REG     = tests/data/lavf.regression
 ROTOZOOM_REG = tests/data/rotozoom.regression
 VSYNTH_REG   = tests/data/vsynth.regression
 
-ifeq ($(CONFIG_SWSCALE),yes)
+ifneq ($(CONFIG_SWSCALE),yes)
 servertest codectest $(CODEC_TESTS) libavtest: swscale_error
 swscale_error:
        @echo
-       @echo "This regression test is incompatible with --enable-swscale."
+       @echo "This regression test requires --enable-swscale."
        @echo
        @exit 1
 endif
@@ -328,6 +331,6 @@ tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
        $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
 
-.PHONY: lib videohook documentation *test regtest-* swscale-error
+.PHONY: lib videohook documentation *test regtest-* swscale-error alltools
 
 -include $(VHOOK_DEPS)