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)
* commit '36b380dcd52ef47d7ba0559ed51192c88d82a9bd':
  libopenh264dec: Simplify the init thanks to FF_CODEC_CAP_INIT_CLEANUP being set

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

Simple merge