Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:52:18 +0000 (14:52 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Dec 2015 13:52:18 +0000 (14:52 +0100)
commit4a80f0bdb042a4701ddd19678c55b8c918e108fa
treeb53fb51e78afc95f7615aadd632d69344d0fb9ff
parenta38b50c3ff0b49cf4c04196ff889d35f105b50c8
parent81c95eb8eee856d98d4ac37367dbc761f2faf875
Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libopenh264enc.c