Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:24:10 +0000 (20:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jan 2014 19:24:15 +0000 (20:24 +0100)
* commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b':
  x86: avcodec: Add a bunch of missing #includes for av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/rv34dsp_init.c
libavcodec/x86/vp6dsp_init.c
libavcodec/x86/vp8dsp_init.c
libavcodec/x86/vp9dsp_init.c

Simple merge
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 "libavutil/attributes.h"
  #include "libavutil/cpu.h"
 -#include "libavutil/internal.h"
  #include "libavutil/mem.h"
  #include "libavutil/x86/asm.h"
  #include "libavutil/x86/cpu.h"