Merge commit '979cb55103fa8e8274806e496901203742c686d1'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:29:30 +0000 (12:29 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:29:30 +0000 (12:29 +0200)
commitb3e5d59537cbd375ca508fe2dfca30bcd2d201d3
treeccd7716b15df1b2780bb21863b8e3a8e474d563b
parent90ec89a629b3bd948713c8da2f7f118f4a5620b2
parent979cb55103fa8e8274806e496901203742c686d1
Merge commit '979cb55103fa8e8274806e496901203742c686d1'

* commit '979cb55103fa8e8274806e496901203742c686d1':
  hevc: Split the sei parsing in 3 functions

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/hevc_sei.c