[FFmpeg-cvslog] Merge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  9 20:08:58 2015 +0200| [9fd3d9acf7fbf46bf1d7af518a4690d8f7cf3886] | committer: Michael Niedermayer

Merge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'

* commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b':
  v210: Fix typo in header guards

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

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