Merge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:57:23 +0000 (13:57 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:57:23 +0000 (13:57 -0300)
commitff44c2d4f483cda53859ce019f3815c69239a7e0
tree3db5484de8ef73e184ecff0550204a613156a038
parentef71ef5f30ddf1cd61e46628a04608892caf76d2
parent83678dbbae64ad8c501e0c732c1117e642c25dae
Merge commit '83678dbbae64ad8c501e0c732c1117e642c25dae'

* commit '83678dbbae64ad8c501e0c732c1117e642c25dae':
  libopenh264dec: Export the decoded profile and level in AVCodecContext

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/libopenh264dec.c