]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cca4fd4 17c99b6)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.