Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris>
---
tests/fate/aac.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index ff58392ad9..de7b912e20 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -251,21 +251,21 @@ fate-aac-latm_stereo_to_51: REF =
$(SAMPLES)/aac/latm_stereo_to_51_ref.s16
fate-aac-autobsf-adtstoasc: CMD = transcode "aac"
$(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \
matroska "-c:a copy" "-c:a copy"
-FATE_AAC-$(call DEMDEC, AAC, AAC, ARESAMPLE_FILTER) +=
$(FATE_AAC_CT_RAW)
-FATE_AAC-$(call DEMDEC, MOV, AAC, ARESAMPLE_FILTER) +=
$(FATE_AAC)
-FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) +=
$(FATE_AAC_LATM)
-FATE_AAC-$(call DEMDEC, AAC, AAC_FIXED, ARESAMPLE_FILTER) +=
$(FATE_AAC_FIXED)
+FATE_AAC-$(call PCM, AAC, AAC, ARESAMPLE_FILTER) +=
$(FATE_AAC_CT_RAW)
+FATE_AAC-$(call PCM, MOV, AAC, ARESAMPLE_FILTER) +=
$(FATE_AAC)
+FATE_AAC_LATM-$(call PCM, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) +=
$(FATE_AAC_LATM)
+FATE_AAC-$(call PCM, AAC, AAC_FIXED, ARESAMPLE_FILTER) +=
$(FATE_AAC_FIXED)
FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes)
$(FATE_AAC_ALL): CMP = oneoff
$(FATE_AAC_ALL): FUZZ = 2
-FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS, ARESAMPLE_FILTER) +=
$(FATE_AAC_ENCODE)
+FATE_AAC_ENCODE-$(call TRANSCODE, AAC, ADTS AAC, WAV_MUXER WAV_DEMUXER
PCM_S16LE_DECODER ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE)
-FATE_AAC_BSF-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER) +=
fate-aac-autobsf-adtstoasc
+FATE_AAC_BSF-$(call DEMDEC, AAC MATROSKA, AAC, AAC_ADTSTOASC_BSF
MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc
FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes)
$(FATE_AAC_BSF-yes)
-fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) $(FATE_AAC_BSF-yes)
+fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes)
fate-aac-latm: $(FATE_AAC_LATM-yes)
--
2.30.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
