configure: Do not enable both OpenCL-VAAPI interop modes simultaneously

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 9defddebfdaed73c024b2a585c594db050b39d05..48c59733b83b4e7e21c5e7d876401490b3a87670 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ tools/target_dec_%_fuzzer$(EXESUF): $(FF_DEP_LIBS)
 CONFIGURABLE_COMPONENTS =                                           \
     $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))                 \
     $(SRC_PATH)/libavcodec/bitstream_filters.c                      \
+    $(SRC_PATH)/libavcodec/parsers.c                                \
     $(SRC_PATH)/libavformat/protocols.c                             \
 
 config.h: ffbuild/.config
@@ -134,7 +135,7 @@ uninstall-data:
 
 clean::
        $(RM) $(CLEANSUFFIXES)
-       $(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES))
+       $(RM) $(addprefix compat/,$(CLEANSUFFIXES)) $(addprefix compat/*/,$(CLEANSUFFIXES)) $(addprefix compat/*/*/,$(CLEANSUFFIXES))
        $(RM) -r coverage-html
        $(RM) -rf coverage.info coverage.info.in lcov
 
@@ -142,7 +143,9 @@ distclean:: clean
        $(RM) .version avversion.h config.asm config.h mapfile  \
                ffbuild/.config ffbuild/config.* libavutil/avconfig.h \
                version.h libavutil/ffversion.h libavcodec/codec_names.h \
-               libavcodec/bsf_list.c libavformat/protocol_list.c
+               libavcodec/bsf_list.c libavformat/protocol_list.c \
+               libavcodec/codec_list.c libavcodec/parser_list.c \
+               libavformat/muxer_list.c libavformat/demuxer_list.c
 ifeq ($(SRC_LINK),src)
        $(RM) src
 endif
@@ -156,7 +159,7 @@ check: all alltools examples testprogs fate
 
 include $(SRC_PATH)/tests/Makefile
 
-$(sort $(OBJDIRS)):
+$(sort $(OUTDIRS)):
        $(Q)mkdir -p $@
 
 # Dummy rule to stop make trying to rebuild removed or renamed headers