Return pkt->size in v4l2_read_packet().

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 1d8705580b27267162aa7d2969a10d87f4462302..5fd409471007491d2a897cb9921e650ec226cc6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,12 @@ PROGS-$(CONFIG_FFMPEG)   += ffmpeg
 PROGS-$(CONFIG_FFPLAY)   += ffplay
 PROGS-$(CONFIG_FFSERVER) += ffserver
 
-PROGS       = $(addsuffix   $(EXESUF), $(PROGS-yes))
+PROGS      := $(addsuffix   $(EXESUF), $(PROGS-yes))
 PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
 OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
 MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
+TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
+HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr)
 
 BASENAMES   = ffmpeg ffplay ffserver
 ALLPROGS    = $(addsuffix   $(EXESUF), $(BASENAMES))
@@ -31,11 +33,11 @@ FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
 FF_DEP_LIBS  := $(DEP_LIBS)
 
-ALL_TARGETS-$(BUILD_DOC)    += documentation
+ALL_TARGETS-$(CONFIG_DOC)       += documentation
 
-ifneq ($(PROGS),)
+ifdef PROGS
 INSTALL_TARGETS-yes             += install-progs install-data
-INSTALL_TARGETS-$(BUILD_DOC)    += install-man
+INSTALL_TARGETS-$(CONFIG_DOC)   += install-man
 endif
 INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
 
@@ -46,7 +48,8 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
        $(STRIP) $@
 
 SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
-               ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS
+               ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
+               HOSTPROGS
 
 define RESET
 $(1) :=
@@ -77,10 +80,11 @@ ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
 
 cmdutils.o cmdutils.d: version.h
 
-alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper qt-faststart trasher))
+alltools: $(TOOLS)
 
-documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html ffserver-doc.html \
-                                 ffplay-doc.html general.html $(ALLMANPAGES))
+documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html \
+                                 ffplay-doc.html ffserver-doc.html       \
+                                 general.html libavfilter.html $(ALLMANPAGES))
 
 doc/%.html: doc/%.texi
        texi2html -monolithic -number $<
@@ -126,7 +130,7 @@ clean:: testclean
        rm -f doc/*.html doc/*.pod doc/*.1
        rm -f tests/seek_test$(EXESUF) tests/seek_test.o
        rm -f $(addprefix tests/,$(addsuffix $(HOSTEXESUF),audiogen videogen rotozoom tiny_psnr))
-       rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper qt-faststart trasher))
+       rm -f $(TOOLS)
 
 distclean::
        rm -f $(DISTCLEANSUFFIXES)
@@ -143,6 +147,7 @@ fulltest test: codectest lavftest seektest
 
 FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
 LAVF_REFFILE     = $(SRC_PATH)/tests/lavf.regression.ref
+LAVFI_REFFILE    = $(SRC_PATH)/tests/lavfi.regression.ref
 ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref
 SEEK_REFFILE     = $(SRC_PATH)/tests/seek.regression.ref
 VSYNTH_REFFILE   = $(SRC_PATH)/tests/vsynth.regression.ref
@@ -179,9 +184,12 @@ CODEC_TESTS = $(addprefix regtest-,             \
         snowll                                  \
         dv                                      \
         dv50                                    \
-        dnxhd                                   \
+        dnxhd_1080i                             \
+        dnxhd_720p                              \
+        dnxhd_720p_rd                           \
         svq1                                    \
         flashsv                                 \
+        roq                                     \
         mp2                                     \
         ac3                                     \
         g726                                    \
@@ -190,6 +198,7 @@ CODEC_TESTS = $(addprefix regtest-,             \
         adpcm_ms                                \
         adpcm_yam                               \
         adpcm_swf                               \
+        alac                                    \
         flac                                    \
         wma                                     \
         pcm                                     \
@@ -234,14 +243,19 @@ LAVF_TESTS = $(addprefix regtest-,              \
         pcx                                     \
     )
 
+LAVFI_TESTS = $(addprefix regtest-,             \
+    )
+
 RESFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%)))
 
 ROTOZOOM_RESFILES = $(call RESFILES,rotozoom.regression,$(CODEC_TESTS))
 VSYNTH_RESFILES   = $(call RESFILES,vsynth.regression,$(CODEC_TESTS))
 
 LAVF_RESFILES = $(call RESFILES,lavf.regression,$(LAVF_TESTS))
+LAVFI_RESFILES = $(call RESFILES,lavfi.regression,$(LAVFI_TESTS))
 
 LAVF_RESFILE     = tests/data/lavf.regression
+LAVFI_RESFILE    = tests/data/lavfi.regression
 ROTOZOOM_RESFILE = tests/data/rotozoom.regression
 VSYNTH_RESFILE   = tests/data/vsynth.regression
 
@@ -261,18 +275,23 @@ codectest: $(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE)
 lavftest: $(LAVF_RESFILE)
        diff -u -w $(LAVF_REFFILE) $(LAVF_RESFILE)
 
-$(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) $(LAVF_RESFILE):
+# lavfitest: $(LAVFI_RESFILE)
+#      diff -u -w $(LAVFI_REFFILE) $(LAVFI_RESFILE)
+
+$(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) $(LAVF_RESFILE) $(LAVFI_RESFILE):
        cat $^ > $@
 
 $(LAVF_RESFILE):     $(LAVF_RESFILES)
+$(LAVFI_RESFILE):    $(LAVFI_RESFILES)
 $(ROTOZOOM_RESFILE): $(ROTOZOOM_RESFILES)
 $(VSYNTH_RESFILE):   $(VSYNTH_RESFILES)
 
 $(VSYNTH_RESFILES) $(ROTOZOOM_RESFILES): $(CODEC_TESTS)
 
 $(LAVF_RESFILES): $(LAVF_TESTS)
+$(LAVFI_RESFILES): $(LAVFI_TESTS)
 
-$(CODEC_TESTS) $(LAVF_TESTS): regtest-ref
+$(CODEC_TESTS) $(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref
 
 regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm tests/data/asynth1.sw
 
@@ -281,7 +300,10 @@ $(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(HOSTEXESUF)
        $(SRC_PATH)/tests/codec-regression.sh $@ rotozoom tests/vsynth2 a "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 $(LAVF_TESTS):
-       $(SRC_PATH)/tests/codec-regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
+       $(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
+
+$(LAVFI_TESTS):
+       $(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 b "$(TARGET_EXEC)" "$(TARGET_PATH)"
 
 seektest: codectest lavftest tests/seek_test$(EXESUF)
        $(SRC_PATH)/tests/seek-regression.sh $(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)"
@@ -305,9 +327,6 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
        mkdir -p tests/data
        $(BUILD_ROOT)/$< $@
 
-tests/%$(HOSTEXESUF): tests/%.c
-       $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
-
 tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)