Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:33:57 +0000 (14:33 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 12 May 2016 13:34:03 +0000 (14:34 +0100)
commit97946b20b6d8c8746ca41490534d7ecceaab799b
treea34eec4a113e153bd99df74646cde88c4c69e146
parentdd4fb2339f76a958bd7e63e5ac18b8c10852ae1a
parentf3ed484953b81856e40239d2410058a96188b2be
Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'

* commit 'f3ed484953b81856e40239d2410058a96188b2be':
  h264_mp4toannexb_bsf: do not fail on annex B extradata

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/h264_mp4toannexb_bsf.c