Merge commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:45:08 +0000 (10:45 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:45:08 +0000 (10:45 +0100)
commit0bd76401d1666bf8f0a67946d761ed9ba4751e49
tree706638190fc8e565395e72ea6869e3c5e4775196
parent6fb07c7d85c0d0464e5bdaaad55cc2b774468b3d
parent36b380dcd52ef47d7ba0559ed51192c88d82a9bd
Merge commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd'

* commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd':
  libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set

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