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)
commit130c33af35c5d8798f70c62586ab228d4f8cd2a2
tree5b300c61adb7c908441e76fcd2c50cc16fc566b7
parentd808dce4a98f86be210d334185cacb662fbb20c2
parentb23bc95920e2f10b9621857e829c45b064f356c0
Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'

* commit 'b23bc95920e2f10b9621857e829c45b064f356c0':
  x86: dca: Add missing multiple inclusion guards

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