[FFmpeg-cvslog] Merge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 12:18:40 2015 +0200| [2e290d61147a084de86777c26c95908ce62e0033] | committer: Hendrik Leppkes

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

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