From 6a288ada55c0e5a2a74e1ea2b5666412282cb3db Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 18 Sep 2022 18:22:55 +0200 Subject: [PATCH] fate/lavf-*: Add missing dependency on pipe protocol Forgotten in bf1337f99c66ac574c6e4da65c305ca878f1d65d. Signed-off-by: Andreas Rheinhardt --- tests/fate/lavf-audio.mak | 2 +- tests/fate/lavf-container.mak | 2 +- tests/fate/lavf-image.mak | 2 +- tests/fate/lavf-image2pipe.mak | 3 ++- tests/fate/lavf-video.mak | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/fate/lavf-audio.mak b/tests/fate/lavf-audio.mak index edbd872b11..d54cd107e0 100644 --- a/tests/fate/lavf-audio.mak +++ b/tests/fate/lavf-audio.mak @@ -22,7 +22,7 @@ FATE_LAVF_AUDIO_RESAMPLE-$(call ENCDEC, WAVPACK, WV) += wv FATE_LAVF_AUDIO-$(CONFIG_ARESAMPLE_FILTER) += $(FATE_LAVF_AUDIO_RESAMPLE-yes) FATE_LAVF_AUDIO = $(FATE_LAVF_AUDIO-yes:%=fate-lavf-%) -FATE_LAVF_AUDIO := $(if $(call ENCDEC, PCM_S16LE, CRC PCM_S16LE), $(FATE_LAVF_AUDIO)) +FATE_LAVF_AUDIO := $(if $(call ENCDEC, PCM_S16LE, CRC PCM_S16LE, PIPE_PROTOCOL), $(FATE_LAVF_AUDIO)) $(FATE_LAVF_AUDIO): CMD = lavf_audio $(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 7fb54d7406..4bf7636b56 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -28,7 +28,7 @@ FATE_LAVF_CONTAINER_SCALE := dv dv_pal dv_ntsc flm gxf gxf_pal gxf_ntsc \ FATE_LAVF_CONTAINER-$(!CONFIG_SCALE_FILTER) := $(filter-out $(FATE_LAVF_CONTAINER_SCALE),$(FATE_LAVF_CONTAINER-yes)) FATE_LAVF_CONTAINER = $(FATE_LAVF_CONTAINER-yes:%=fate-lavf-%) -FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER), $(FATE_LAVF_CONTAINER)) +FATE_LAVF_CONTAINER := $(if $(call ENCDEC2, RAWVIDEO PGMYUV, PCM_S16LE, CRC IMAGE2, PCM_S16LE_DEMUXER PIPE_PROTOCOL), $(FATE_LAVF_CONTAINER)) $(FATE_LAVF_CONTAINER): CMD = lavf_container $(FATE_LAVF_CONTAINER): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%) diff --git a/tests/fate/lavf-image.mak b/tests/fate/lavf-image.mak index 784c85a9f4..4177e091b3 100644 --- a/tests/fate/lavf-image.mak +++ b/tests/fate/lavf-image.mak @@ -1,6 +1,6 @@ LAVF_IMAGES = $(call ALLYES, FILE_PROTOCOL IMAGE2_DEMUXER PGMYUV_DECODER \ SCALE_FILTER $(1)_ENCODER IMAGE2_MUXER \ - $(1)_DECODER RAWVIDEO_ENCODER CRC_MUXER) + $(1)_DECODER RAWVIDEO_ENCODER CRC_MUXER PIPE_PROTOCOL) FATE_LAVF_IMAGES-$(call LAVF_IMAGES, BMP) += bmp FATE_LAVF_IMAGES-$(call LAVF_IMAGES, DPX) += dpx diff --git a/tests/fate/lavf-image2pipe.mak b/tests/fate/lavf-image2pipe.mak index 318655140b..868b6433d6 100644 --- a/tests/fate/lavf-image2pipe.mak +++ b/tests/fate/lavf-image2pipe.mak @@ -1,7 +1,8 @@ LAVF_IMAGE2PIPE = $(call ALLYES, $(1)_DECODER $(1)_ENCODER $(2) \ IMAGE2_DEMUXER PGMYUV_DECODER \ IMAGE2PIPE_MUXER IMAGE2PIPE_DEMUXER \ - RAWVIDEO_ENCODER CRC_MUXER FILE_PROTOCOL) + RAWVIDEO_ENCODER CRC_MUXER \ + FILE_PROTOCOL PIPE_PROTOCOL) FATE_LAVF_IMAGE2PIPE-$(call LAVF_IMAGE2PIPE, PBM, PNM_PARSER SCALE_FILTER) += pbmpipe FATE_LAVF_IMAGE2PIPE-$(call LAVF_IMAGE2PIPE, PGM, PNM_PARSER SCALE_FILTER) += pgmpipe diff --git a/tests/fate/lavf-video.mak b/tests/fate/lavf-video.mak index 7557283dd3..e73f8f203b 100644 --- a/tests/fate/lavf-video.mak +++ b/tests/fate/lavf-video.mak @@ -12,7 +12,7 @@ FATE_LAVF_VIDEO-$(call ENCDEC, WRAPPED_AVFRAME RAWVIDEO, YUV4MPEGPIPE) += y4m FATE_LAVF_VIDEO-$(CONFIG_SCALE_FILTER) += $(FATE_LAVF_VIDEO_SCALE-yes) FATE_LAVF_VIDEO = $(FATE_LAVF_VIDEO-yes:%=fate-lavf-%) FATE_LAVF_VIDEO := $(if $(call ALLYES, IMAGE2_DEMUXER PGMYUV_DECODER \ - RAWVIDEO_ENCODER CRC_MUXER), \ + RAWVIDEO_ENCODER CRC_MUXER, PIPE_PROTOCOL), \ $(FATE_LAVF_VIDEO)) $(FATE_LAVF_VIDEO): CMD = lavf_video