Merge commit 'eec93e57096aa4804862d62760442380c70d489b'
authorJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 18:43:30 +0000 (15:43 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 18:43:30 +0000 (15:43 -0300)
commitf05f210526a3dc2d9fa6b1c228e3907ebd1d43c6
tree0b87c7feeb138233f309e7933f4cd4012cf60068
parente4e04dce1fab81bcdef82e60184d50c73d212c6a
parenteec93e57096aa4804862d62760442380c70d489b
Merge commit 'eec93e57096aa4804862d62760442380c70d489b'

* commit 'eec93e57096aa4804862d62760442380c70d489b':
  libopenh264dec: Use a newer decoding entry point function

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