Correctly handle case where buffer is 100% full

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 3e56867140c5e7301ffee6ad76e91dd9f619a196..2aa93486a2e0c4da8b2ef5120f7e79125896f2f3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,13 @@
 #
 include config.mak
 
-VPATH=$(SRC_PATH_BARE)
+vpath %.c    $(SRC_PATH_BARE)
+vpath %.h    $(SRC_PATH_BARE)
+vpath %.texi $(SRC_PATH_BARE)
 
 CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
        -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libswscale \
-       -I$(SRC_PATH)/libavdevice \
+       -I$(SRC_PATH)/libavdevice -I$(SRC_PATH)/libavfilter \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE -DHAVE_AV_CONFIG_H
 LDFLAGS+= -g
 
@@ -69,6 +71,11 @@ LDFLAGS+=-L$(BUILD_ROOT)/libswscale
 EXTRALIBS+=-lswscale$(BUILDSUF)
 endif
 
+ifeq ($(CONFIG_AVFILTER),yes)
+LDFLAGS+=-L$(BUILD_ROOT)/libavfilter
+EXTRALIBS := -lavfilter$(BUILDSUF) $(EXTRALIBS)
+endif
+
 MAKE-yes = $(MAKE)
 MAKE-    = : $(MAKE)
 
@@ -79,8 +86,9 @@ lib:
        $(MAKE)                    -C libavcodec  all
        $(MAKE)                    -C libavformat all
        $(MAKE)                    -C libavdevice all
-       $(MAKE-$(CONFIG_PP))       -C libpostproc all
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc all
        $(MAKE-$(CONFIG_SWSCALER)) -C libswscale  all
+       $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter all
 
 ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
        $(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
@@ -113,7 +121,7 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)
 
 ffmpeg.o ffplay.o ffserver.o: version.h
 
-videohook: .libs $(HOOKS)
+videohook: $(HOOKS)
 
 vhook/%$(SLIBSUF): vhook/%.o
        $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
@@ -164,19 +172,18 @@ install-libs:
        $(MAKE)                    -C libavcodec  install-libs
        $(MAKE)                    -C libavformat install-libs
        $(MAKE)                    -C libavdevice install-libs
-       $(MAKE-$(CONFIG_PP))       -C libpostproc install-libs
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-libs
        $(MAKE-$(CONFIG_SWSCALER)) -C libswscale  install-libs
-ifeq ($(BUILD_SHARED),yes)
-       -$(LDCONFIG)
-endif
+       $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-libs
 
 install-headers:
-       $(MAKE)              -C libavutil   install-headers
-       $(MAKE)              -C libavcodec  install-headers
-       $(MAKE)              -C libavformat install-headers
-       $(MAKE)              -C libavdevice install-headers
-       $(MAKE-$(CONFIG_PP)) -C libpostproc install-headers
-       $(MAKE)              -C libswscale  install-headers
+       $(MAKE)                    -C libavutil   install-headers
+       $(MAKE)                    -C libavcodec  install-headers
+       $(MAKE)                    -C libavformat install-headers
+       $(MAKE)                    -C libavdevice install-headers
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc install-headers
+       $(MAKE)                    -C libswscale  install-headers
+       $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter install-headers
 
 uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
 
@@ -197,6 +204,7 @@ uninstall-libs:
        $(MAKE) -C libavdevice uninstall-libs
        $(MAKE) -C libpostproc uninstall-libs
        $(MAKE) -C libswscale  uninstall-libs
+       $(MAKE) -C libavfilter uninstall-libs
 
 uninstall-headers:
        $(MAKE) -C libavutil   uninstall-headers
@@ -205,6 +213,7 @@ uninstall-headers:
        $(MAKE) -C libavdevice uninstall-headers
        $(MAKE) -C libpostproc uninstall-headers
        $(MAKE) -C libswscale  uninstall-headers
+       $(MAKE) -C libavfilter uninstall-headers
        -rmdir "$(INCDIR)"
 
 depend dep: .depend .vhookdep
@@ -212,8 +221,9 @@ depend dep: .depend .vhookdep
        $(MAKE)                    -C libavcodec  depend
        $(MAKE)                    -C libavformat depend
        $(MAKE)                    -C libavdevice depend
-       $(MAKE-$(CONFIG_PP))       -C libpostproc depend
+       $(MAKE-$(CONFIG_POSTPROC)) -C libpostproc depend
        $(MAKE-$(CONFIG_SWSCALER)) -C libswscale  depend
+       $(MAKE-$(CONFIG_AVFILTER)) -C libavfilter depend
 
 .depend: $(SRCS) version.h
        $(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
@@ -234,6 +244,7 @@ clean:
        $(MAKE) -C libavdevice clean
        $(MAKE) -C libpostproc clean
        $(MAKE) -C libswscale  clean
+       $(MAKE) -C libavfilter clean
        rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
           output_example$(EXESUF)
        rm -f doc/*.html doc/*.pod doc/*.1
@@ -249,6 +260,7 @@ distclean: clean
        $(MAKE) -C libavdevice distclean
        $(MAKE) -C libpostproc distclean
        $(MAKE) -C libswscale  distclean
+       $(MAKE) -C libavfilter distclean
        rm -f .depend .vhookdep version.h config.* *.pc
 
 TAGS:
@@ -280,7 +292,6 @@ CODEC_TESTS = $(addprefix regtest-,             \
         rc                                      \
         mpeg4adv                                \
         mpeg4thread                             \
-        mp4psp                                  \
         error                                   \
         mpeg4nr                                 \
         mpeg1b                                  \
@@ -303,6 +314,7 @@ CODEC_TESTS = $(addprefix regtest-,             \
         ac3                                     \
         g726                                    \
         adpcm_ima_wav                           \
+        adpcm_ima_qt                            \
         adpcm_ms                                \
         adpcm_yam                               \
         adpcm_swf                               \
@@ -359,8 +371,8 @@ ROTOZOOM_REG = tests/data/rotozoom.regression
 VSYNTH_REG   = tests/data/vsynth.regression
 
 codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
-       diff -u $(FFMPEG_REFFILE)   $(VSYNTH_REG)
-       diff -u $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
+       diff -u -w $(FFMPEG_REFFILE)   $(VSYNTH_REG)
+       diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
 
 libavtest: $(LAVF_REG)
        diff -u -w $(LIBAV_REFFILE) $(LAVF_REG)