Merge commit 'dc4d726bab59f349d366916ba01df16289e5c81f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 19:05:18 +0000 (20:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Jan 2014 19:05:18 +0000 (20:05 +0100)
commit221dc52d03e113bd394ea3c6746d4b5506bd7dd1
treeb4d28503876e0c099dd4d7c8c0523bdca2bab9ef
parentfd334b9b6e89068c59be2e0a910800c6527812b0
parentdc4d726bab59f349d366916ba01df16289e5c81f
Merge commit 'dc4d726bab59f349d366916ba01df16289e5c81f'

* commit 'dc4d726bab59f349d366916ba01df16289e5c81f':
  build: Add separate hidden config option for the intrax8 code

Conflicts:
libavcodec/Makefile

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