This is robust for some corner case there is incorrect list1 count
in pps header, but it's a P slice and can be decoded well.
Signed-off-by: Decai Lin <decai....@intel.com>
---
libavcodec/h264_parse.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index 290ab68..a42cc29 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -242,7 +242,12 @@ int ff_h264_parse_ref_count(int *plist_count, int
ref_count[2],
ref_count[1] = 1;
}
- if (ref_count[0] - 1 > max[0] || ref_count[1] - 1 > max[1]) {
+ if (slice_type_nos == AV_PICTURE_TYPE_B)
+ list_count = 2;
+ else
+ list_count = 1;
+
+ if (ref_count[0] - 1 > max[0] || (list_count == 2 && (ref_count[1] - 1
> max[1]))) {
av_log(logctx, AV_LOG_ERROR, "reference overflow %u > %u or %u >
%u\n",
ref_count[0] - 1, max[0], ref_count[1] - 1, max[1]);
ref_count[0] = ref_count[1] = 0;
@@ -250,10 +255,6 @@ int ff_h264_parse_ref_count(int *plist_count, int
ref_count[2],
goto fail;
}
- if (slice_type_nos == AV_PICTURE_TYPE_B)
- list_count = 2;
- else
- list_count = 1;
} else {
list_count = 0;
ref_count[0] = ref_count[1] = 0;
--
1.8.3.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
