From fe2eb9760f3d1552298d8d12c7045eb327e70220 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 12 Apr 2022 03:18:52 +0200 Subject: [PATCH] fate/oma: Use REMUX where appropriate Simplifies the checks. Signed-off-by: Andreas Rheinhardt --- tests/fate/oma.mak | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/fate/oma.mak b/tests/fate/oma.mak index a088feff21..7e2020b7d0 100644 --- a/tests/fate/oma.mak +++ b/tests/fate/oma.mak @@ -8,14 +8,8 @@ fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sampl FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1" -FATE_OMA_FFMPEG-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \ - OMA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_OMA_REMUX-yes) -FATE_OMA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \ - OMA_DEMUXER FRAMECRC_MUXER \ - PIPE_PROTOCOL) \ - += $(FATE_OMA_REMUX_FFPROBE-yes) +FATE_OMA_FFMPEG-$(call REMUX, OMA) += $(FATE_OMA_REMUX-yes) +FATE_OMA_FFMPEG_FFPROBE-$(call REMUX, OMA) += $(FATE_OMA_REMUX_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_OMA_FFMPEG-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes) fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes)