Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:32:05 +0000 (14:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:32:05 +0000 (14:32 +0200)
commit477641e9f8a711b65a463ea75a4167b7cfdc84a5
tree3e9ad5bed88a8aa05f580d5db98dbb226899b184
parent29daad5b98bc07b9669c22b39113f5568ef1c570
parenta64f6a04ac5773aeff2003897455dadb9609f18b
Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b'

* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
libavcodec/x86/Makefile

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