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)
commit390452bab627c8c2ccd316ac71106ca6d7ca190c
tree75cf2f13d1c951880a504db39547ef7a598d7786
parentb4f97d4a0edcaf1b41e670b782677e2a0f579081
parentb0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b
Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'

* commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b':
  x86: avcodec: Add a bunch of missing #includes for av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
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