diff options
| author | Andriy Gelman <andriy.gelman@gmail.com> | 2019-09-22 00:17:29 -0400 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-09-26 11:20:14 -0300 |
| commit | 80e1c93c87f12e8ad8a2a37b0976204fddeaccc5 (patch) | |
| tree | a910eeda14a0a0754dc1563dc2e853daee7c8863 | |
| parent | 9b611deef176029750a498fe2369b4e7c7d0ffd6 (diff) | |
| download | ffmpeg-80e1c93c87f12e8ad8a2a37b0976204fddeaccc5.tar.gz | |
avcodec/hevc_ps: Remove dead code in vps_id check
Since reading 4 bits always returns a value in the range [0, 15], the
check for vps_id >= HEVC_MAX_VPS_COUNT, where HEVC_MAX_VPS_COUNT = 16, is redundant.
Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/hevc_ps.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index abf08b919b..a30b8b8022 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -448,10 +448,6 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, memcpy(vps->data, gb->buffer, vps->data_size); vps_id = get_bits(gb, 4); - if (vps_id >= HEVC_MAX_VPS_COUNT) { - av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", vps_id); - goto err; - } if (get_bits(gb, 2) != 3) { // vps_reserved_three_2bits av_log(avctx, AV_LOG_ERROR, "vps_reserved_three_2bits is not three\n"); @@ -883,10 +879,6 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, // Coded parameters sps->vps_id = get_bits(gb, 4); - if (sps->vps_id >= HEVC_MAX_VPS_COUNT) { - av_log(avctx, AV_LOG_ERROR, "VPS id out of range: %d\n", sps->vps_id); - return AVERROR_INVALIDDATA; - } if (vps_list && !vps_list[sps->vps_id]) { av_log(avctx, AV_LOG_ERROR, "VPS %d does not exist\n", |