Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 14:44:36 +0000 (15:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 14:44:48 +0000 (15:44 +0100)
* commit 'b23bc95920e2f10b9621857e829c45b064f356c0':
  x86: dca: Add missing multiple inclusion guards

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

Simple merge