rtpdec_h264: Pass NAL type 0 through

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 0e0b62429d172cf858f46b3b6328a783a1207c20..e52d5c5b4bd2a15e2e4ce95bf4a7c940c609acce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
 MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
 HTMLPAGES   = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes)))
 TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
-HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr)
+HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64)
 
 BASENAMES   = ffmpeg ffplay ffprobe ffserver
 ALLPROGS    = $(addsuffix   $(EXESUF), $(BASENAMES))
@@ -29,6 +29,7 @@ FFLIBS-$(CONFIG_AVFORMAT) += avformat
 FFLIBS-$(CONFIG_AVCODEC)  += avcodec
 FFLIBS-$(CONFIG_POSTPROC) += postproc
 FFLIBS-$(CONFIG_SWSCALE)  += swscale
+FFLIBS-$(CONFIG_AVCORE)   += avcore
 
 FFLIBS := avutil
 
@@ -58,6 +59,9 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
 
 config.h: .config
 .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
+       @-tput bold 2>/dev/null
+       @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n'
+       @-tput sgr0 2>/dev/null
 
 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
                ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
@@ -88,7 +92,7 @@ tools/%$(EXESUF): tools/%.o
 tools/%.o: tools/%.c
        $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_O) $<
 
-ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
+ffplay.o: CFLAGS += $(SDL_CFLAGS)
 
 VERSION_SH  = $(SRC_PATH_BARE)/version.sh
 GIT_LOG     = $(SRC_PATH_BARE)/.git/logs/HEAD
@@ -111,8 +115,9 @@ documentation: $(addprefix doc/, developer.html faq.html general.html libavfilte
 
 $(HTMLPAGES) $(MANPAGES): doc/fftools-common-opts.texi
 
-doc/ffmpeg.pod doc/ffmpeg-doc.html: doc/filters.texi
-doc/ffplay.pod doc/ffplay-doc.html: doc/filters.texi
+doc/ffmpeg.pod doc/ffmpeg-doc.html: doc/bitstream_filters.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
+doc/ffplay.pod doc/ffplay-doc.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi
+doc/ffprobe.pod doc/ffprobe-doc.html: doc/indevs.texi doc/protocols.texi
 
 doc/%.html: TAG = HTML
 doc/%.html: doc/%.texi
@@ -155,7 +160,7 @@ testclean:
        $(RM) -r tests/vsynth1 tests/vsynth2 tests/data
        $(RM) $(addprefix tests/,$(CLEANSUFFIXES))
        $(RM) tests/seek_test$(EXESUF) tests/seek_test.o
-       $(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
+       $(RM) $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr base64))
 
 clean:: testclean
        $(RM) $(ALLPROGS) $(ALLPROGS_G)
@@ -167,9 +172,8 @@ distclean::
        $(RM) $(DISTCLEANSUFFIXES)
        $(RM) version.h config.* libavutil/avconfig.h
 
-config .config:
+config:
        $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
-       @touch .config
 
 # regression tests
 
@@ -222,10 +226,19 @@ tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN
 tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
+tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS)
+       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
+
 include $(SRC_PATH_BARE)/tests/fate.mak
 include $(SRC_PATH_BARE)/tests/fate2.mak
 
-FATE_TESTS += $(FATE2_TESTS)
+include $(SRC_PATH_BARE)/tests/fate/aac.mak
+include $(SRC_PATH_BARE)/tests/fate/als.mak
+include $(SRC_PATH_BARE)/tests/fate/fft.mak
+include $(SRC_PATH_BARE)/tests/fate/h264.mak
+include $(SRC_PATH_BARE)/tests/fate/mp3.mak
+include $(SRC_PATH_BARE)/tests/fate/vorbis.mak
+include $(SRC_PATH_BARE)/tests/fate/vp8.mak
 
 FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
 FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
@@ -244,7 +257,7 @@ FATE = $(FATE_ACODEC)                                                   \
 $(FATE_ACODEC): $(AREF)
 $(FATE_VCODEC): $(VREF)
 $(FATE_LAVF):   $(REFS)
-$(FATE_LAVFI):  $(REFS)
+$(FATE_LAVFI):  $(REFS) tools/lavfi-showfiltfmts$(EXESUF)
 $(FATE_SEEK):   fate-codec fate-lavf tests/seek_test$(EXESUF)
 
 $(FATE_ACODEC):  CMD = codectest acodec
@@ -264,15 +277,19 @@ fate-seek:   $(FATE_SEEK)
 ifdef SAMPLES
 FATE += $(FATE_TESTS)
 else
-fate2 $(FATE_TESTS):
+$(FATE_TESTS):
        @echo "SAMPLES not specified, cannot run FATE"
 endif
 
+FATE_UTILS = base64 tiny_psnr
+
 fate: $(FATE)
-fate2: $(FATE2_TESTS)
 
-$(FATE): ffmpeg$(EXESUF) tests/tiny_psnr$(HOSTEXESUF)
+$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
        @echo "TEST    $(@:fate-%=%)"
        $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)'
 
+fate-list:
+       @printf '%s\n' $(sort $(FATE))
+
 .PHONY: documentation *test regtest-* alltools check config