Merge commit '030de53e9cc225dc767458aedcc87efd457b4f3b'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:44:11 +0000 (00:44 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 03:44:11 +0000 (00:44 -0300)
commite9b6212de29a966f200833220ed35f51852f05f6
tree7175a17d6355e5a3a6a9269a14087422239514e3
parent42f27d1b8eab9ea88d2e9faeb35f72dd72eca7b4
parent030de53e9cc225dc767458aedcc87efd457b4f3b
Merge commit '030de53e9cc225dc767458aedcc87efd457b4f3b'

* commit '030de53e9cc225dc767458aedcc87efd457b4f3b':
  libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filter

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