diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:11:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:11:53 +0100 |
| commit | 1e4e4979117e91360185edd5f58026e5e090fe41 (patch) | |
| tree | c768872bd48451a984d20a067d105b370335af98 /tests/fate/aac.mak | |
| parent | 0fe8c9f4585866457b5eb79aa34c32468ad39425 (diff) | |
| parent | e6c4c0f7cfaf0378a70f6f7f0611d4c21433067a (diff) | |
| download | ffmpeg-1e4e4979117e91360185edd5f58026e5e090fe41.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: atrac: Place atrac1 and atrac3 tests in different groups
fate: aac: cosmetics: Group AAC LATM tests together
x86: avresample: Add missing colons to assembly labels
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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index b87ef761f9..2fdf74f18c 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -46,18 +46,10 @@ FATE_AAC += fate-aac-al_sbr_ps_06_ur fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(SAMPLES)/aac/al_sbr_ps_06_new.mp4 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16 -FATE_AAC_LATM += fate-aac-latm_000000001180bc60 -fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg -fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 - FATE_AAC += fate-aac-ap05_48 fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4 fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16 -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-ct%: CMD = pcm -i $(SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%) fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav @@ -88,6 +80,14 @@ fate-aac-ln-encode: CMP_SHIFT = -4096 fate-aac-ln-encode: CMP_TARGET = 65 fate-aac-ln-encode: SIZE_TOLERANCE = 3560 +FATE_AAC_LATM += fate-aac-latm_000000001180bc60 +fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg +fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 + +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_ALL): CMP = oneoff |