[FFmpeg-cvslog] Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Dec 18 14:52:18 2015 +0100| [4a80f0bdb042a4701ddd19678c55b8c918e108fa] | committer: Hendrik Leppkes

Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'

* commit '81c95eb8eee856d98d4ac37367dbc761f2faf875':
  openh264: Directly include the deprecation guards header

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

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