diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 17:59:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 17:59:47 +0100 |
| commit | 8983dea426e34ced61d518f440be21d0f49ddb6d (patch) | |
| tree | 150f3930000c99da4432f1ce70042385068becd5 | |
| parent | 2c6e693c975465691ced790ec52ef65588410117 (diff) | |
| parent | c673fc919c374c60b1e6d80d8822712eadf67f16 (diff) | |
| download | ffmpeg-8983dea426e34ced61d518f440be21d0f49ddb6d.tar.gz | |
Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'
* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
hevc_sei: drop unused parameter
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc_sei.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 1770eb52c4..af8cb7d60e 100644 --- a/libavcodec/hevc_sei.c +++ b/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); |