Browse Source

avcodec/hevc_ps: Change num_tile_rows/columns checks to sps->ctb_height/weight

Suggested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3b2082c663)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.1.4
Michael Niedermayer 6 years ago
parent
commit
df61ec263f
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/hevc_ps.c

+ 2
- 2
libavcodec/hevc_ps.c View File

@@ -1591,14 +1591,14 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx,
int num_tile_rows_minus1 = get_ue_golomb(gb);

if (num_tile_columns_minus1 < 0 ||
num_tile_columns_minus1 >= sps->width - 1) {
num_tile_columns_minus1 >= sps->ctb_width - 1) {
av_log(avctx, AV_LOG_ERROR, "num_tile_columns_minus1 out of range: %d\n",
num_tile_columns_minus1);
ret = num_tile_columns_minus1 < 0 ? num_tile_columns_minus1 : AVERROR_INVALIDDATA;
goto err;
}
if (num_tile_rows_minus1 < 0 ||
num_tile_rows_minus1 >= sps->height - 1) {
num_tile_rows_minus1 >= sps->ctb_height - 1) {
av_log(avctx, AV_LOG_ERROR, "num_tile_rows_minus1 out of range: %d\n",
num_tile_rows_minus1);
ret = num_tile_rows_minus1 < 0 ? num_tile_rows_minus1 : AVERROR_INVALIDDATA;


Loading…
Cancel
Save