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>

diff --cc libavcodec/hevc_sei.c
index 8ae680e5ebbc628513592112c977561e615b36d1,c376da2d7e6e864037f427c15dbb0089859fe2c2..ecb0f24f8f1ef94b080774919af36e22226ee873
--- 1/libavcodec/hevc_sei.c
--- 2/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@@ -163,26 -133,18 +191,26 @@@ static int decode_nal_sei_message(HEVCC
          payload_size += byte;
      }
      if (s->nal_unit_type == NAL_SEI_PREFIX) {
-         if (payload_type == 256 /*&& s->decode_checksum_sei*/) {
 -        if (payload_type == 256) // Mismatched value from HM 8.1
++        if (payload_type == 256 /*&& s->decode_checksum_sei*/) // Mismatched value from HM 8.1
              decode_nal_sei_decoded_picture_hash(s);
-         } else if (payload_type == 45) {
+         else if (payload_type == SEI_TYPE_FRAME_PACKING)
              decode_nal_sei_frame_packing_arrangement(s);
-         } else if (payload_type == 47) {
+         else if (payload_type == SEI_TYPE_DISPLAY_ORIENTATION)
              decode_nal_sei_display_orientation(s);
-         } else if (payload_type == 1){
 -        else {
++        else if (payload_type == SEI_TYPE_PICTURE_TIMING){
 +            int ret = decode_pic_timing(s);
              av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
              skip_bits(gb, 8 * payload_size);
-         } else if (payload_type == 129){
 +            return ret;
++        } else if (payload_type == SEI_TYPE_ACTIVE_PARAMETER_SETS){
 +            active_parameter_sets(s);
 +            av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
 +        } else {
 +            av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
 +            skip_bits(gb, 8*payload_size);
          }
      } else { /* nal_unit_type == NAL_SEI_SUFFIX */
-         if (payload_type == 132 /* && s->decode_checksum_sei */)
 -        if (payload_type == SEI_TYPE_DECODED_PICTURE_HASH)
++        if (payload_type == SEI_TYPE_DECODED_PICTURE_HASH /* && s->decode_checksum_sei */)
              decode_nal_sei_decoded_picture_hash(s);
          else {
              av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type);