]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a38b50c 81c95eb)
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)
* commit '81c95eb8eee856d98d4ac37367dbc761f2faf875':
  openh264: Directly include the deprecation guards header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/libopenh264enc.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/libopenh264enc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.