Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Nov 2012 14:11:53 +0000 (15:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Nov 2012 14:11:53 +0000 (15:11 +0100)
commit1e4e4979117e91360185edd5f58026e5e090fe41
treec768872bd48451a984d20a067d105b370335af98
parent0fe8c9f4585866457b5eb79aa34c32468ad39425
parente6c4c0f7cfaf0378a70f6f7f0611d4c21433067a
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>
tests/fate/aac.mak