From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Fri, 18 Dec 2015 13:52:18 +0000 (+0100)
Subject: Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4a80f0bdb042a4701ddd19678c55b8c918e108fa;p=ffmpeg

Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'

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

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

4a80f0bdb042a4701ddd19678c55b8c918e108fa