lavf/mpjpeg: do not include CRLF preceding boundary as part of the returned frame

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 306f060ec3ac64201ec77a740456068f171d2f36..87a986965742280bbda3949d34a87e354a96f798 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ include config.mak
 vpath %.c    $(SRC_PATH)
 vpath %.cpp  $(SRC_PATH)
 vpath %.h    $(SRC_PATH)
+vpath %.inc  $(SRC_PATH)
 vpath %.m    $(SRC_PATH)
 vpath %.S    $(SRC_PATH)
 vpath %.asm  $(SRC_PATH)
@@ -85,7 +86,7 @@ SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS      \
                HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS            \
                ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS     \
                ALTIVEC-OBJS MMX-OBJS YASM-OBJS                           \
-               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSPR1-OBJS MSA-OBJS       \
+               MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS         \
                MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS
 
 define RESET
@@ -176,11 +177,15 @@ clean::
        $(RM) $(CLEANSUFFIXES)
        $(RM) $(CLEANSUFFIXES:%=tools/%)
        $(RM) -r coverage-html
-       $(RM) -rf coverage.info lcov
+       $(RM) -rf coverage.info coverage.info.in lcov
 
 distclean::
        $(RM) $(DISTCLEANSUFFIXES)
        $(RM) config.* .config libavutil/avconfig.h .version avversion.h version.h libavutil/ffversion.h libavcodec/codec_names.h
+ifeq ($(SRC_LINK),src)
+       $(RM) src
+endif
+       $(RM) -rf doc/examples/pc-uninstalled
 
 config:
        $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)