fate/oma: Use REMUX where appropriate

Simplifies the checks.

Andreas Rheinhardt committed 4 years ago

Commit fe2eb971 parent c3b2bee1 file · +2 −8Browse files

Unified · Split

tests/fate/oma.mak+2−8

@@ -8,14 +8,8 @@ fate-oma-atrac3p-remux: CMD = transcode oma $(TARGET_SAMPLES)/atrac3p/at3p_sampl · 7 unmodified lines
8	8	FATE_OMA_REMUX-$(CONFIG_WAV_DEMUXER) += fate-oma-atrac3-remux
9	9	fate-oma-atrac3-remux: CMD = transcode wav $(TARGET_SAMPLES)/atrac3/mc_sich_at3_132_small.wav oma "-c copy" "-c copy -t 0.1"
10	10
11		−FATE_OMA_FFMPEG-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \
12		− OMA_DEMUXER FRAMECRC_MUXER \
13		− PIPE_PROTOCOL) \
14		− += $(FATE_OMA_REMUX-yes)
15		−FATE_OMA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL OMA_MUXER \
16		− OMA_DEMUXER FRAMECRC_MUXER \
17		− PIPE_PROTOCOL) \
18		− += $(FATE_OMA_REMUX_FFPROBE-yes)
	11	+FATE_OMA_FFMPEG-$(call REMUX, OMA) += $(FATE_OMA_REMUX-yes)
	12	+FATE_OMA_FFMPEG_FFPROBE-$(call REMUX, OMA) += $(FATE_OMA_REMUX_FFPROBE-yes)
19	13	FATE_SAMPLES_FFMPEG += $(FATE_OMA_FFMPEG-yes)
20	14	FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_OMA_FFMPEG_FFPROBE-yes)
21	15	fate-oma: $(FATE_OMA_FFMPEG-yes) $(FATE_OMA_FFMPEG_FFPROBE-yes)