summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/h264_slice.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 201b22455c..89ea16a57f 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1911,8 +1911,13 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
sl->max_pic_num = 1 << (sps->log2_max_frame_num + 1);
}
- if (nal->type == H264_NAL_IDR_SLICE)
- sl->idr_pic_id = get_ue_golomb_long(&sl->gb);
+ if (nal->type == H264_NAL_IDR_SLICE) {
+ unsigned idr_pic_id = get_ue_golomb_long(&sl->gb);
+ if (idr_pic_id < 65536) {
+ sl->idr_pic_id = idr_pic_id;
+ } else
+ av_log(h->avctx, AV_LOG_WARNING, "idr_pic_id is invalid\n");
+ }
sl->poc_lsb = 0;
sl->delta_poc_bottom = 0;