diff options
| author | Decai Lin <decai.lin@intel.com> | 2019-01-31 15:36:56 +0800 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-08 12:00:59 +0100 |
| commit | 9d800d39d557965d63eb671a6de50d0c6ef6d4ab (patch) | |
| tree | bf84efbedef5b32f3c2bcfb07c1c10d6b1e5de34 | |
| parent | 1c15449ca9a5bfa387868ac55628397273da761f (diff) | |
| download | ffmpeg-9d800d39d557965d63eb671a6de50d0c6ef6d4ab.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h264_parse.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 290ab681a9..a42cc299ff 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; |