Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'

* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
  hevc_sei: drop unused parameter

Conflicts:
	libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/hevc_sei.c

@@ -25,8 +25,7 @@
 #include "hevc.h"
 #include "golomb.h"
 
-static void decode_nal_sei_decoded_picture_hash(HEVCContext *s,
-                                                int payload_size)
+static void decode_nal_sei_decoded_picture_hash(HEVCContext *s)
 {
     int cIdx, i;
     uint8_t hash_type;
@@ -145,7 +144,7 @@ static int decode_nal_sei_message(HEVCContext *s)
     }
     if (s->nal_unit_type == NAL_SEI_PREFIX) {
         if (payload_type == 256 /*&& s->decode_checksum_sei*/) {
-            decode_nal_sei_decoded_picture_hash(s, payload_size);
+            decode_nal_sei_decoded_picture_hash(s);
             return 1;
         } else if (payload_type == 45) {
             decode_nal_sei_frame_packing_arrangement(s);
@@ -166,7 +165,7 @@ static int decode_nal_sei_message(HEVCContext *s)
         }
     } else { /* nal_unit_type == NAL_SEI_SUFFIX */
         if (payload_type == 132 /* && s->decode_checksum_sei */)
-            decode_nal_sei_decoded_picture_hash(s, payload_size);
+            decode_nal_sei_decoded_picture_hash(s);
         else {
             av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type);
             skip_bits(gb, 8 * payload_size);