Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 13:57:58 +0000 (14:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 13:58:04 +0000 (14:58 +0100)
commit8372aaf7210e0833b17982a3ced304c47e8f668b
tree6d2fd66b45300a4c72cb46878dec0fc37153cebc
parenta0cfec2e2bbb59984787eee25fcc62559db6d8d9
parent017a06a9ee86b047079166c2694c9c655ff03356
Merge commit '017a06a9ee86b047079166c2694c9c655ff03356'

* commit '017a06a9ee86b047079166c2694c9c655ff03356':
  x86: dsputil: Use correct file name as multiple inclusion guard

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