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)
* commit '017a06a9ee86b047079166c2694c9c655ff03356':
  x86: dsputil: Use correct file name as multiple inclusion guard

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

Simple merge