]> git.sesse.net Git - ffmpeg/commit
Merge commit '17c99b6158f2c6720af74e81ee727ee50d2e7e96'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:19:49 +0000 (15:19 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Nov 2016 14:19:49 +0000 (15:19 +0100)
commit62d9b7a69b9bf1ec702fe46c5f31bf88c85d22a2
treea536226e750685bf4dc0c2b587ebe7a62edf61fd
parentcca4fd477851c3ab3b4ee7da525d5eb81bbe8de1
parent17c99b6158f2c6720af74e81ee727ee50d2e7e96
Merge commit '17c99b6158f2c6720af74e81ee727ee50d2e7e96'

* commit '17c99b6158f2c6720af74e81ee727ee50d2e7e96':
  h2645_parse: handle embedded Annex B NAL units in size prefixed NAL units

This commit is a noop, see a9bb4cf87d1eb68f9ed2dc971e3400b95c1a6a78

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>