Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 22:41:12 +0000 (23:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 22:41:17 +0000 (23:41 +0100)
commitd61e1156beae2f33aceb7c12010c1475d3e597d5
tree5d31229e5fd388b5d8a4685db77b7d8b1047884f
parente52d97a7aceb90e4b4de52e3f6ef2718e8cd9d61
parent17608f6ee3d2088cdb8d1e704276d8b34f01160d
Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'

* commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d':
  x86: Add some more missing headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/simple_idct.c