Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:10:53 +0000 (13:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jul 2013 11:10:53 +0000 (13:10 +0200)
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
  mlpdsp: x86: Respect cpuflags

Conflicts:
libavcodec/x86/mlpdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/mlpdsp.c

   */
  
  #include "libavutil/attributes.h"
 -#include "libavutil/internal.h"
+ #include "libavutil/cpu.h"
  #include "libavutil/x86/asm.h"
+ #include "libavutil/x86/cpu.h"
  #include "libavcodec/mlpdsp.h"
  #include "libavcodec/mlp.h"