Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:47:53 +0000 (02:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:58:08 +0000 (02:58 +0200)
* qatar/master:
  fate: aac: Add test for AAC-ELD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/aac.mak

Simple merge