]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '7a76371437f9562c3414f985523f883489e3936a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:47:08 +0000 (10:47 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:47:08 +0000 (10:47 +0100)
* commit '7a76371437f9562c3414f985523f883489e3936a':
  libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP

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

Simple merge