From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 17 Oct 2013 17:50:19 +0000 (+0200)
Subject: Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'
X-Git-Tag: android-x86-4.4-r1~538
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=123c6ca80983d57392dae85576ed30f011e496bc;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'

* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

123c6ca80983d57392dae85576ed30f011e496bc