You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-04 22:03:09 +02:00
fate/aac: fix multiple dependencies
Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
committed by
Michael Niedermayer
parent
ee29f2f455
commit
af40eb2ef7
@ -241,21 +241,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 \
|
fate-aac-autobsf-adtstoasc: CMD = transcode "aac" $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \
|
||||||
matroska "-c:a copy" "-c:a copy"
|
matroska "-c:a copy" "-c:a copy"
|
||||||
|
|
||||||
FATE_AAC-$(call DEMDEC, AAC, AAC, ARESAMPLE_FILTER) += $(FATE_AAC_CT_RAW)
|
FATE_AAC-$(call PCM, AAC, AAC, ARESAMPLE_FILTER) += $(FATE_AAC_CT_RAW)
|
||||||
FATE_AAC-$(call DEMDEC, MOV, AAC, ARESAMPLE_FILTER) += $(FATE_AAC)
|
FATE_AAC-$(call PCM, MOV, AAC, ARESAMPLE_FILTER) += $(FATE_AAC)
|
||||||
FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) += $(FATE_AAC_LATM)
|
FATE_AAC_LATM-$(call PCM, 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_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED)
|
||||||
|
|
||||||
FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes)
|
FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes)
|
||||||
|
|
||||||
$(FATE_AAC_ALL): CMP = oneoff
|
$(FATE_AAC_ALL): CMP = oneoff
|
||||||
$(FATE_AAC_ALL): FUZZ = 2
|
$(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_PARSER AAC_ADTSTOASC_BSF MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc
|
||||||
|
|
||||||
FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes)
|
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)
|
fate-aac-latm: $(FATE_AAC_LATM-yes)
|
||||||
|
Reference in New Issue
Block a user