[FFmpeg-cvslog] Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 19 15:44:36 2014 +0100| [130c33af35c5d8798f70c62586ab228d4f8cd2a2] | committer: Michael Niedermayer

Merge commit 'b23bc95920e2f10b9621857e829c45b064f356c0'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=130c33af35c5d8798f70c62586ab228d4f8cd2a2
---