Merge commit '043f46f5741e1a5caedf55d788e1a72aae3b7605'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:25:41 +0000 (12:25 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:25:41 +0000 (12:25 +0200)
commit90ec89a629b3bd948713c8da2f7f118f4a5620b2
treec92da97798700f4b1bc4c2d0ba4688cc5f5cbf6b
parent2e290d61147a084de86777c26c95908ce62e0033
parent043f46f5741e1a5caedf55d788e1a72aae3b7605
Merge commit '043f46f5741e1a5caedf55d788e1a72aae3b7605'

* commit '043f46f5741e1a5caedf55d788e1a72aae3b7605':
  hevc: Use switch instead of if-nests in decode_nal_sei_message

Conflicts:
libavcodec/hevc_sei.c

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