From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 4 Oct 2013 12:36:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~786
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d8e8495c9d733dd9004b26da9c73fddba7c14e5;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fdct: Only build fdct code if encoders have been enabled

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

9d8e8495c9d733dd9004b26da9c73fddba7c14e5