Merge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:18:40 +0000 (12:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:18:40 +0000 (12:18 +0200)
commit2e290d61147a084de86777c26c95908ce62e0033
tree7d9e0d74a976a1dba805e5be25a38097521c3aa7
parent582d98aed97a1295f19e628bbc7e05a6e27569b8
parent2cd841c0776535be56e4db67485fdd9509c9b9f4
Merge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4'

* commit '2cd841c0776535be56e4db67485fdd9509c9b9f4':
  hevc: Use a proper enum for the SEI values

Conflicts:
libavcodec/hevc_sei.c

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