RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h264_parse: no need check ref list1 for P slices. 

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.lin@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Decai Lin 2019-01-31 15:36:56 +08:00 committed by Michael Niedermayer
parent 1c15449ca9
commit 9d800d39d5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264_parse.c
View File

@ -242,7 +242,12 @@ int ff_h264_parse_ref_count(int *plist_count, int ref_count[2],
ref_count[1] = 1; 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", 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] - 1, max[0], ref_count[1] - 1, max[1]);
ref_count[0] = ref_count[1] = 0; 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; goto fail;
} }
if (slice_type_nos == AV_PICTURE_TYPE_B)
list_count = 2;
else
list_count = 1;
} else { } else {
list_count = 0; list_count = 0;
ref_count[0] = ref_count[1] = 0; ref_count[0] = ref_count[1] = 0;