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)
* commit '030de53e9cc225dc767458aedcc87efd457b4f3b':
  libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filter

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

Simple merge