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)
* commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d':
  x86: Add some more missing headers

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

Simple merge
Simple merge
Simple merge
@@@ -20,7 -20,9 +20,8 @@@
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  #include "libavcodec/simple_idct.h"
 -#include "libavutil/internal.h"
  #include "libavutil/mem.h"
+ #include "libavutil/x86/asm.h"
  #include "dsputil_x86.h"
  
  #if HAVE_INLINE_ASM