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>

diff --cc tests/fate/aac.mak
index b87ef761f9835ba70f58cd8831855aabf21064a9,ea738c51965c9c06fbc23b82746ea4fc0314d5e0..2fdf74f18ca40240b0f65b9dd20d9e75fe9a81f7
--- 1/tests/fate/aac.mak
--- 2/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@@ -71,23 -63,14 +63,31 @@@ FATE_AAC_CT = sbr_bc-ps_i.3gp  
  
  FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%)
  
 +FATE_AAC_ENCODE += fate-aac-aref-encode
 +fate-aac-aref-encode: ./tests/data/asynth-44100-2.wav
 +fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 512k
 +fate-aac-aref-encode: CMP = stddev
 +fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav
 +fate-aac-aref-encode: CMP_SHIFT = -4096
 +fate-aac-aref-encode: CMP_TARGET = 1862
 +fate-aac-aref-encode: SIZE_TOLERANCE = 2464
 +
 +FATE_AAC_ENCODE += fate-aac-ln-encode
 +fate-aac-ln-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 512k
 +fate-aac-ln-encode: CMP = stddev
 +fate-aac-ln-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
 +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