[FFmpeg-cvslog] Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Sep 12 15:16:57 2015 +0200| [95f92b2513342d3122320de6f80ebf8e55a91728] | committer: Hendrik Leppkes

Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'

* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b':
  lavc: Sanitize header inclusion guards

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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