[FFmpeg-cvslog] Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 14:38:05 2014 +0100| [7766c7b7a0097e257c9070c9ef4275f8ec9b46dc] | committer: Michael Niedermayer

Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'

* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
  arm: Use full filenames as multiple inclusion guards

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

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