diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:12:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:12:25 +0100 |
| commit | 4d941eac1655b21af33c6e4d52b7bfd7f9e5b990 (patch) | |
| tree | 54fb5dafa6b702dc50fe5bd3691ec44679acf055 /tests/fate/aac.mak | |
| parent | 62006b539ddda23594febf0fcb2f21c03de60457 (diff) | |
| parent | 3b4296f41473a5b39e84d7a49d480624c9c60040 (diff) | |
| download | ffmpeg-4d941eac1655b21af33c6e4d52b7bfd7f9e5b990.tar.gz | |
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/aac.mak')
| -rw-r--r-- | tests/fate/aac.mak | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 2fdf74f18c..c5c47e6e72 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -53,9 +53,10 @@ fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16 fate-aac-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%) fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav +FATE_AAC_CT_RAW = fate-aac-ct-sbr_i-ps_i.aac + FATE_AAC_CT = sbr_bc-ps_i.3gp \ sbr_bic-ps_i.3gp \ - sbr_i-ps_i.aac \ sbr_bc-ps_bc.mp4 \ sbr_bc-ps_i.mp4 \ sbr_i-ps_bic.mp4 \ @@ -88,7 +89,11 @@ FATE_AAC_LATM += fate-aac-latm_stereo_to_51 fate-aac-latm_stereo_to_51: CMD = pcm -i $(SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 -FATE_AAC_ALL = $(FATE_AAC) $(FATE_AAC_LATM) +FATE_AAC-$(call DEMDEC, AAC, AAC) += $(FATE_AAC_CT_RAW) +FATE_AAC-$(call DEMDEC, MOV, AAC) += $(FATE_AAC) +FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM) += $(FATE_AAC_LATM) + +FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_ALL): CMP = oneoff $(FATE_AAC_ALL): FUZZ = 2 @@ -96,4 +101,4 @@ $(FATE_AAC_ALL): FUZZ = 2 FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) -fate-aac-latm: $(FATE_AAC_LATM) +fate-aac-latm: $(FATE_AAC_LATM-yes) |