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)
commit07502e473f0c28fdb781954d5ca1aca5f039179a
tree7ee2a450e466c6ca7a399961461b76c86977ebb5
parent7e9474ca47fd4d267bdafcc8162fded67f6410e5
parent7a76371437f9562c3414f985523f883489e3936a
Merge commit '7a76371437f9562c3414f985523f883489e3936a'

* commit '7a76371437f9562c3414f985523f883489e3936a':
  libopenh264enc: Simplify init by setting FF_CODEC_CAP_INIT_CLEANUP

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