Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-23 20:27:48 +0300
committerJames Almer <jamrial@gmail.com>2017-03-23 20:27:48 +0300
commit6397815be0bee10948387fcb90ead36ec2834ef7 (patch)
treee616efad05f1147821dd80f88dae04707d795193 /libavcodec/hevc_sei.c
parenta1a80a6c9ce5309632a8b5c0241fa5ffcd09b5fc (diff)
parentc359d624d3efc3fd1d83210d78c4152bd329b765 (diff)
Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'
* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765': hevcdec: move decoder-independent declarations into a separate header Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_sei.c')
-rw-r--r--libavcodec/hevc_sei.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index bb4414402d..a4b93c2b3f 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -272,7 +272,7 @@ static int active_parameter_sets(HEVCContext *s)
}
active_seq_parameter_set_id = get_ue_golomb_long(gb);
- if (active_seq_parameter_set_id >= MAX_SPS_COUNT) {
+ if (active_seq_parameter_set_id >= HEVC_MAX_SPS_COUNT) {
av_log(s->avctx, AV_LOG_ERROR, "active_parameter_set_id %d invalid\n", active_seq_parameter_set_id);
return AVERROR_INVALIDDATA;
}
@@ -349,7 +349,7 @@ static int decode_nal_sei_message(HEVCContext *s)
byte = get_bits(gb, 8);
payload_size += byte;
}
- if (s->nal_unit_type == NAL_SEI_PREFIX) {
+ if (s->nal_unit_type == HEVC_NAL_SEI_PREFIX) {
return decode_nal_sei_prefix(s, payload_type, payload_size);
} else { /* nal_unit_type == NAL_SEI_SUFFIX */
return decode_nal_sei_suffix(s, payload_type, payload_size);