[FFmpeg-cvslog] Merge commit '043f46f5741e1a5caedf55d788e1a72aae3b7605'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 12:25:41 2015 +0200| [90ec89a629b3bd948713c8da2f7f118f4a5620b2] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90ec89a629b3bd948713c8da2f7f118f4a5620b2
---