Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 18:12:31 +0000 (20:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 18:12:31 +0000 (20:12 +0200)
commit19b79c1429c4234b6ca60ca21e0ed8a152db1343
treed4f8d48d8f11c13a2b479ec3ed78ac94f3481f4f
parent5036c8b17b29623cd86b514474d1c0a81acf1e13
parentb0de1c766329dd8c9960ad1722e2f653160abc1b
Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b'

* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b':
  x86: build: Only compile FDCT code if MMX is enabled

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile